Update to 1.2.0.

PR:		209297
Submitted by:	tkato432 yahoo com
Sponsored by:	Absolight

12 files changed, 497 insertions, 359 deletions

diff --git a/graphics/mypaint/Makefile b/graphics/mypaint/Makefile
index 9158098..ed36d3c 100644
--- a/graphics/mypaint/Makefile
+++ b/graphics/mypaint/Makefile
@@ -2,54 +2,47 @@
 # $FreeBSD$
 
 PORTNAME=	mypaint
-DISTVERSIONPREFIX=	v
-DISTVERSION=	1.1.0
-PORTREVISION=	6
+PORTVERSION=	1.2.0
 CATEGORIES=	graphics
+MASTER_SITES=	https://github.com/mypaint/mypaint/releases/download/${PORTVERSION:S/^/v/}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast painting/scribbling program
 
-LICENSE=	GPLv2+ ISCL MIT
+LICENSE=	GPLv2+ ISCL
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
 LICENSE_FILE_ISCL=	${WRKSRC}/brushlib/COPYING
-LICENSE_FILE_MIT=	${WRKSRC}/COPYING.cursors
 
-RUN_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo \
-		${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf
+BUILD_DEPENDS=	swig13>0:devel/swig13 \
+		${PYNUMPY}
 LIB_DEPENDS=	libjson-c.so:devel/json-c \
 		liblcms2.so:graphics/lcms2
-BUILD_DEPENDS:=	${RUN_DEPENDS} \
-		swig:devel/swig13 \
-		protoc:devel/protobuf
-
-USE_GITHUB=	yes
-USE_GNOME=	glib20 pygtk2
-MAKE_ARGS=	prefix="${PREFIX}"
+RUN_DEPENDS=	${PYNUMPY}
+
+USE_GNOME=	gtk30 pygobject3 librsvg2:run
+MAKE_ARGS=	prefix=${PREFIX} \
+		enable_profiling=False \
+		use_sharedlib=True \
+		python_binary="${PYTHON_CMD}" \
+		python_config="${PYTHON_CMD}-config"
 # XXX gcc-c++11-lib to fix runtime issues with old -lgcc_s and Clang
-USES=		compiler:gcc-c++11-lib desktop-file-utils gettext \
-		pkgconfig python scons tar:bzip2
+USES=		compiler:gcc-c++11-lib desktop-file-utils gettext localbase \
+		pkgconfig python:2 scons tar:xz
+USE_CSTD=	c99
+INSTALL_TARGET=	${STAGEDIR} --install-sandbox=${STAGEDIR}
+USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
-SUB_FILES=	pkg-install
-
-post-patch:
-	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
-		${WRKSRC}/brushlib/operationqueue.c \
-		${WRKSRC}/brushlib/fifo.c
-	@${REINPLACE_CMD} 's|-O3||g; s|-g||g' \
-		${WRKSRC}/SConstruct
+OPTIONS_DEFINE=		GEGL
+OPTIONS_SUB=		yes
 
-pre-install:
-	@${RM} -rf ${WRKSRC}/sandbox 2>/dev/null || ${TRUE}
-	@(cd ${WRKSRC} && ${DO_MAKE_BUILD} --install-sandbox=pre-stage)
+GEGL_DESC=		Graph based image processing framework support
+GEGL_LIB_DEPENDS=	libgegl-0.3.so:graphics/gegl3
+GEGL_MAKE_ARGS=		enable_gegl=True
 
-do-install:
-.for d in . po brushlib brushlib/po
-	(cd ${WRKSRC}/${d}/pre-stage && ${PAX} -rw . ${STAGEDIR})
-.endfor
+post-install:
+	${INSTALL_LIB} ${WRKSRC}/brushlib/libmypaint*.so ${STAGEDIR}${PREFIX}/lib
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mypaint/_mypaintlib.so
 
 .include <bsd.port.mk>
diff --git a/graphics/mypaint/distinfo b/graphics/mypaint/distinfo
index 7a99e4b..ab2cc83 100644
--- a/graphics/mypaint/distinfo
+++ b/graphics/mypaint/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mypaint-mypaint-v1.1.0_GH0.tar.gz) = 59d8323c60423c9a15e02ff93e406d25a7919df3af826089f0cf7f1124c9dbd1
-SIZE (mypaint-mypaint-v1.1.0_GH0.tar.gz) = 37871920
+SHA256 (mypaint-1.2.0.tar.xz) = cdab33dd0c146cf678c97bcdd44e561f97a0aec40421b8c6785a74b33b9728e2
+SIZE (mypaint-1.2.0.tar.xz) = 37895196
diff --git a/graphics/mypaint/files/patch-SConstruct b/graphics/mypaint/files/patch-SConstruct
index b0d3ec7..dddcd49 100644
--- a/graphics/mypaint/files/patch-SConstruct
+++ b/graphics/mypaint/files/patch-SConstruct
@@ -1,24 +1,30 @@
---- SConstruct.orig	2012-12-31 16:35:54 UTC
+--- SConstruct.orig	2016-01-15 19:42:54 UTC
 +++ SConstruct
-@@ -39,7 +39,7 @@ opts.Add('python_config', 'python-config
+@@ -95,14 +95,14 @@ if "$CCFLAGS" in env['CXXCOM']:
  
- tools = ['default', 'textfile']
- 
--env = Environment(ENV=os.environ, options=opts, tools=tools)
-+env = Environment(ENV=os.environ, options=opts, tools=tools, **dict((k, v.split()) for k, v in ARGUMENTS.iteritems()))
- print('building for %r (use scons python_binary=xxx to change)' % env['python_binary'])
- print('using %r (use scons python_config=xxx to change)' % env['python_config'])
- if sys.platform == "win32":
-@@ -47,9 +47,9 @@ if sys.platform == "win32":
-     env = Environment(tools=tools + ['mingw'], ENV=os.environ, options=opts)
  opts.Update(env)
  
 -env.Append(CXXFLAGS=' -Wall -Wno-sign-compare -Wno-write-strings')
 -env.Append(CCFLAGS='-Wall')
 -env.Append(CFLAGS='-std=c99')
-+env.Append(CXXFLAGS=['-Wall', '-Wno-sign-compare', '-Wno-write-strings'])
-+env.Append(CCFLAGS=['-Wall'])
-+env.Append(CFLAGS=['-std=c99'])
++#env.Append(CXXFLAGS=' -Wall -Wno-sign-compare -Wno-write-strings')
++#env.Append(CCFLAGS='-Wall')
++#env.Append(CFLAGS='-std=c99')
+ 
+ env['GEGL_VERSION'] = 0.3
  
  # Define strdup() in string.h under glibc >= 2.10 (POSIX.1-2008)
- env.Append(CFLAGS='-D_POSIX_C_SOURCE=200809L')
+-env.Append(CFLAGS='-D_POSIX_C_SOURCE=200809L')
++#env.Append(CFLAGS='-D_POSIX_C_SOURCE=200809L')
+ 
+ if env.get('CPPDEFINES'):
+     # make sure assertions are enabled
+@@ -113,7 +113,7 @@ if env['debug']:
+     env.Append(CCFLAGS='-O0', LINKFLAGS='-O0')
+ else:
+     # Overridable defaults
+-    env.Prepend(CCFLAGS='-O3', LINKFLAGS='-O3')
++    env.Prepend(CCFLAGS='', LINKFLAGS='')
+ 
+ if env['enable_profiling'] or env['debug']:
+     env.Append(CCFLAGS='-g')
diff --git a/graphics/mypaint/files/patch-brushlib-SConscript b/graphics/mypaint/files/patch-brushlib-SConscript
deleted file mode 100644
index 3821a46..0000000
--- a/graphics/mypaint/files/patch-brushlib-SConscript
+++ /dev/null
@@ -1,28 +0,0 @@
---- brushlib/SConscript.orig	2012-12-31 16:35:54 UTC
-+++ brushlib/SConscript
-@@ -47,7 +47,7 @@ def create_pkgconfig_files(env, pkgconfi
-     }
-     pc_file = env.Substfile('%s.pc' % pkgconfig_name,
-                             "pkgconfig.pc.in", SUBST_DICT=pkg_info)
--    install_perms(env, '$prefix/lib/pkgconfig', pc_file)
-+    install_perms(env, '$prefix/libdata/pkgconfig', pc_file)
- 
-     return pc_file
- 
-@@ -56,6 +56,7 @@ def create_pkgconfig_files(env, pkgconfi
- # and also add our own specifics ones without affecting the other builds
- top_env = env
- env = env.Clone()
-+env.Prepend(LIBPATH=[".."])
- 
- if env['enable_introspection']:
-     env['use_glib'] = True
-@@ -73,7 +74,7 @@ if env['enable_docs']:
- 
- env.Append(CPPPATH='./')
- 
--pkg_deps = ['json']
-+pkg_deps = ['json-c']
- libs = ['m']
- linkflags = []
- 
diff --git a/graphics/mypaint/files/patch-brushlib-tests-SConscript b/graphics/mypaint/files/patch-brushlib-tests-SConscript
deleted file mode 100644
index e70c91f..0000000
--- a/graphics/mypaint/files/patch-brushlib-tests-SConscript
+++ /dev/null
@@ -1,14 +0,0 @@
---- brushlib/tests/SConscript.orig	2012-12-31 16:35:54 UTC
-+++ brushlib/tests/SConscript
-@@ -13,8 +13,9 @@ def is_test(fn):
- tests_sources = [fn for fn in os.listdir("./") if is_test(fn) and is_csource(fn)]
- testlib_sources = [fn for fn in os.listdir("./") if not is_test(fn) and is_csource(fn)]
- 
--testlib_env.Append(LIBS=['mypaint'])
--testlib_env.Append(CPPPATH=['../'], LIBPATH=['../..'])
-+testlib_env.Append(LIBS=['intl', 'mypaint'])
-+testlib_env.Append(CPPPATH=['../'])
-+testlib_env.Prepend(LIBPATH=['../..'])
- 
- if testlib_env['enable_gperftools']:
-     testlib_env.ParseConfig('pkg-config --cflags --libs libprofiler')
diff --git a/graphics/mypaint/files/patch-brushlib_SConscript b/graphics/mypaint/files/patch-brushlib_SConscript
new file mode 100644
index 0000000..fdd641c
--- /dev/null
+++ b/graphics/mypaint/files/patch-brushlib_SConscript
@@ -0,0 +1,27 @@
+--- brushlib/SConscript.orig	2016-01-15 19:42:55 UTC
++++ brushlib/SConscript
+@@ -52,7 +52,7 @@ def create_pkgconfig_files(env, pkgconfi
+     }
+     pc_file = env.Substfile('%s.pc' % pkgconfig_name,
+                             "pkgconfig.pc.in", SUBST_DICT=pkg_info)
+-    install_perms(env, '$prefix/lib/pkgconfig', pc_file)
++    install_perms(env, '$prefix/libdata/pkgconfig', pc_file)
+ 
+     return pc_file
+ 
+@@ -163,7 +163,6 @@ if env['enable_introspection']:
+     install_perms(env, '$prefix/share/gir-1.0', gir)
+     install_perms(env, '$prefix/lib/girepository-1.0', typelib)
+ 
+-install_perms(env, '$prefix/lib/', brushlib)
+ install_perms(env, '$prefix/include/libmypaint', Glob("./mypaint-*.h"))
+ install_perms(env, '$prefix/include/libmypaint/glib', Glob("./glib/mypaint-*.h"))
+ install_perms(env, "$prefix/share/libmypaint", Glob("./*.py"))
+@@ -183,7 +182,6 @@ if env['enable_gegl']:
+     lib_builder = gegl_env.SharedLibrary if env['use_sharedlib'] else gegl_env.StaticPicLibrary
+     brushlib_gegl = lib_builder('./mypaint-gegl', Glob("./gegl/*.c"))
+ 
+-    install_perms(env, '$prefix/lib/', brushlib_gegl)
+     install_perms(env, '$prefix/include/libmypaint-gegl', Glob("./gegl/mypaint-gegl-*.h"))
+ 
+     create_pkgconfig_files(env, 'libmypaint-gegl', brushlib_version, 'MyPaint brush engine library, with GEGL integration',
diff --git a/graphics/mypaint/files/patch-brushlib_SConstruct b/graphics/mypaint/files/patch-brushlib_SConstruct
new file mode 100644
index 0000000..083e9c7
--- /dev/null
+++ b/graphics/mypaint/files/patch-brushlib_SConstruct
@@ -0,0 +1,30 @@
+--- brushlib/SConstruct.orig	2016-01-15 19:42:55 UTC
++++ brushlib/SConstruct
+@@ -57,14 +57,14 @@ if os.environ.has_key('LDFLAGS'):
+ 
+ opts.Update(env)
+ 
+-env.Append(CXXFLAGS=' -Wall -Wno-sign-compare -Wno-write-strings')
+-env.Append(CCFLAGS='-Wall -Wstrict-prototypes -Werror')
+-env.Append(CFLAGS='-std=c99')
++#env.Append(CXXFLAGS=' -Wall -Wno-sign-compare -Wno-write-strings')
++#env.Append(CCFLAGS='-Wall -Wstrict-prototypes -Werror')
++#env.Append(CFLAGS='-std=c99')
+ 
+ env['GEGL_VERSION'] = 0.3
+ 
+ # Define strdup() in string.h under glibc >= 2.10 (POSIX.1-2008)
+-env.Append(CFLAGS='-D_POSIX_C_SOURCE=200809L')
++#env.Append(CFLAGS='-D_POSIX_C_SOURCE=200809L')
+ 
+ if env.get('CPPDEFINES'):
+     # make sure assertions are enabled
+@@ -75,7 +75,7 @@ if env['debug']:
+     env.Append(CCFLAGS='-O0', LINKFLAGS='-O0')
+ else:
+     # Overridable defaults
+-    env.Prepend(CCFLAGS='-O3', LINKFLAGS='-O3')
++    env.Prepend(CCFLAGS='', LINKFLAGS='')
+ 
+ if env['enable_profiling'] or env['debug']:
+     env.Append(CCFLAGS='-g')
diff --git a/graphics/mypaint/files/patch-brushlib_tests_SConscript b/graphics/mypaint/files/patch-brushlib_tests_SConscript
new file mode 100644
index 0000000..78bf0ac
--- /dev/null
+++ b/graphics/mypaint/files/patch-brushlib_tests_SConscript
@@ -0,0 +1,16 @@
+--- brushlib/tests/SConscript.orig	2016-01-15 19:42:55 UTC
++++ brushlib/tests/SConscript
+@@ -15,11 +15,11 @@ tests_sources = [fn for fn in os.listdir
+ testlib_sources = [fn for fn in os.listdir("./") if not is_test(fn) and is_csource(fn)]
+ 
+ testlib_env.Append(LIBS=['mypaint'])
+-if sys.platform == 'win32':
++if sys.platform == 'win32' or sys.platform.startswith("freebsd"):
+     testlib_env.Append(LIBS=['intl'])
+ elif sys.platform == "msys" and os.environ.get("MSYSTEM") != "MSYS":
+     testlib_env.Append(LIBS=['intl'])
+-testlib_env.Append(CPPPATH=['../'], LIBPATH=['../'])
++testlib_env.Prepend(CPPPATH=['../'], LIBPATH=['../'])
+ 
+ if testlib_env['enable_gperftools']:
+     parse_pkg_config(testlib_env, "libprofiler")
diff --git a/graphics/mypaint/files/patch-lib_glib.py b/graphics/mypaint/files/patch-lib_glib.py
new file mode 100644
index 0000000..ba74c72
--- /dev/null
+++ b/graphics/mypaint/files/patch-lib_glib.py
@@ -0,0 +1,46 @@
+--- lib/glib.py.orig	2016-01-15 19:42:55 UTC
++++ lib/glib.py
+@@ -1,5 +1,5 @@
+ # This file is part of MyPaint.
+-# Copyright (C) 2015 by Andrew Chadwick <a.t.chadwick@gmail.com>
++# Copyright (C) 2015-2016 by the MyPaint Development Team.
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -19,11 +19,12 @@ unicode, and may not even be UTF-8). Thi
+ ## Imports
+ 
+ import sys
+-from logging import getLogger
+-logger = getLogger(__name__)
++import logging
+ 
+ from gi.repository import GLib
+ 
++logger = logging.getLogger(__name__)
++
+ 
+ ## File path getter functions
+ 
+@@ -35,7 +36,6 @@ def filename_to_unicode(opsysstring):
+     :returns: the converted filename
+     :rtype: unicode
+ 
+-    >>> from gi.repository import GLib
+     >>> filename_to_unicode('/ascii/only/path')
+     u'/ascii/only/path'
+     >>> filename_to_unicode(None) is None
+@@ -54,7 +54,12 @@ def filename_to_unicode(opsysstring):
+     # Other systems are dependent in opaque ways on the environment.
+     if not isinstance(opsysstring, str):
+         raise TypeError("Argument must be bytes")
+-    ustring = GLib.filename_to_utf8(opsysstring, -1, 0, 0)
++    # This function's annotation seems to vary quite a bit.
++    # See https://github.com/mypaint/mypaint/issues/634
++    try:
++        ustring, _, _ = GLib.filename_to_utf8(opsysstring, -1)
++    except TypeError:
++        ustring = GLib.filename_to_utf8(opsysstring, -1, 0, 0)
+     if ustring is None:
+         raise UnicodeDecodeError(
+             "GLib failed to convert %r to a UTF-8 string. "
diff --git a/graphics/mypaint/files/patch-mypaint.py b/graphics/mypaint/files/patch-mypaint.py
deleted file mode 100644
index d5784a7..0000000
--- a/graphics/mypaint/files/patch-mypaint.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- mypaint.py.orig	2012-12-31 16:35:54 UTC
-+++ mypaint.py
-@@ -172,11 +172,6 @@ if __name__ == '__main__':
-     print "DEBUG: localepath: ", localepath
-     print "DEBUG: localepath_brushlib: ", localepath_brushlib
- 
--    # Low-level bindtextdomain, required for GtkBuilder stuff.
--    locale.bindtextdomain("mypaint", localepath)
--    locale.bindtextdomain("libmypaint", localepath_brushlib)
--    locale.textdomain("mypaint")
--
-     # Python gettext module.
-     # See http://docs.python.org/release/2.7/library/locale.html
-     gettext.bindtextdomain("mypaint", localepath)
diff --git a/graphics/mypaint/files/pkg-install.in b/graphics/mypaint/files/pkg-install.in
deleted file mode 100644
index b77a941..0000000
--- a/graphics/mypaint/files/pkg-install.in
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-if [ "$2" = "POST-INSTALL" ]; then
-	pygtk_check_file="%%LOCALBASE%%/share/examples/py-gtk/Makefile"
-
-	if [ -e "$pygtk_check_file" ]; then
-		if ! grep -q numpy "$pygtk_check_file"; then
-			message="Dependent x11-toolkits/py-gtk2 port was built with NUMPY option disabled, but mypaint requires it to be enabled. Please rebuild x11-toolkits/py-gtk2 WITH_NUMPY, instead mypaint won't run"
-		fi
-	else
-		message="Note that dependent x11-toolkits/py-gtk2 port should be build with NUMPY option enabled"
-	fi
-
-	if [ -n "$message" ]; then
-		echo "======================================================================"
-		echo
-		echo $message | fmt -w 70
-		echo
-		echo "======================================================================"
-	fi
-fi
diff --git a/graphics/mypaint/pkg-plist b/graphics/mypaint/pkg-plist
index 4293148..af563bf 100644
--- a/graphics/mypaint/pkg-plist
+++ b/graphics/mypaint/pkg-plist
@@ -1,272 +1,280 @@
 bin/mypaint
+bin/mypaint-ora-thumbnailer
 include/libmypaint/glib/mypaint-brush.h
+include/libmypaint/glib/mypaint-gegl-glib.h
 include/libmypaint/mypaint-brush-settings-gen.h
 include/libmypaint/mypaint-brush-settings.h
 include/libmypaint/mypaint-brush.h
 include/libmypaint/mypaint-config.h
 include/libmypaint/mypaint-fixed-tiled-surface.h
 include/libmypaint/mypaint-glib-compat.h
+include/libmypaint/mypaint-rectangle.h
 include/libmypaint/mypaint-surface.h
 include/libmypaint/mypaint-tiled-surface.h
-lib/libmypaint.a
+%%GEGL%%include/libmypaint-gegl/mypaint-gegl-surface.h
+lib/libmypaint.so
+%%GEGL%%lib/libmypaint-gegl.so
+lib/libmypaint-tests.so
 lib/mypaint/_mypaintlib.so
 libdata/pkgconfig/libmypaint.pc
+%%GEGL%%libdata/pkgconfig/libmypaint-gegl.pc
+share/appdata/mypaint.appdata.xml
 share/applications/mypaint.desktop
-share/icons/hicolor/16x16/actions/brush-blend-mode-eraser.png
-share/icons/hicolor/16x16/actions/brush-blend-mode-normal.png
-share/icons/hicolor/16x16/actions/mypaint-brush-blend-mode-alpha-lock.png
-share/icons/hicolor/16x16/actions/mypaint-brush-blend-mode-colorize.png
-share/icons/hicolor/16x16/actions/mypaint-brush-blend-mode-eraser.png
-share/icons/hicolor/16x16/actions/mypaint-brush-blend-mode-normal.png
-share/icons/hicolor/16x16/actions/mypaint-brush-blend-modes.png
-share/icons/hicolor/16x16/actions/mypaint-brush-mods-active.png
-share/icons/hicolor/16x16/actions/mypaint-brush-mods-inactive.png
-share/icons/hicolor/16x16/actions/mypaint-frame.png
-share/icons/hicolor/16x16/actions/mypaint-layer-duplicate.png
-share/icons/hicolor/16x16/actions/mypaint-line-mode-ellipse.png
-share/icons/hicolor/16x16/actions/mypaint-line-mode-freehand.png
-share/icons/hicolor/16x16/actions/mypaint-line-mode-sequence.png
-share/icons/hicolor/16x16/actions/mypaint-line-mode-straight.png
-share/icons/hicolor/16x16/actions/mypaint-line-mode.png
-share/icons/hicolor/16x16/actions/mypaint-move.png
-share/icons/hicolor/16x16/actions/mypaint-symmetry.png
-share/icons/hicolor/16x16/actions/mypaint-tool-brush.png
+share/icons/hicolor/16x16/actions/mypaint-tool-color-palette.png
 share/icons/hicolor/16x16/actions/mypaint-tool-color-rgb.png
-share/icons/hicolor/16x16/actions/mypaint-tool-color-triangle.png
 share/icons/hicolor/16x16/actions/mypaint-tool-component-sliders.png
+share/icons/hicolor/16x16/actions/mypaint-tool-crossed-bowl-color-changer.png
 share/icons/hicolor/16x16/actions/mypaint-tool-hcywheel.png
 share/icons/hicolor/16x16/actions/mypaint-tool-hsvcube.png
+share/icons/hicolor/16x16/actions/mypaint-tool-hsvsquare.png
 share/icons/hicolor/16x16/actions/mypaint-tool-hsvwheel.png
 share/icons/hicolor/16x16/actions/mypaint-tool-hue-wheel.png
-share/icons/hicolor/16x16/actions/mypaint-tool-layers.png
-share/icons/hicolor/16x16/actions/mypaint-tool-move-layer.png
-share/icons/hicolor/16x16/actions/mypaint-tool-paint-color.png
-share/icons/hicolor/16x16/actions/mypaint-tool-scratchpad.png
-share/icons/hicolor/16x16/actions/mypaint-view-100.png
-share/icons/hicolor/16x16/actions/mypaint-view-fit.png
-share/icons/hicolor/16x16/actions/mypaint-view-mirror-horizontal.png
-share/icons/hicolor/16x16/actions/mypaint-view-mirror-vertical.png
-share/icons/hicolor/16x16/actions/mypaint-view-pan.png
-share/icons/hicolor/16x16/actions/mypaint-view-rotate-anticlockwise.png
-share/icons/hicolor/16x16/actions/mypaint-view-rotate-clockwise.png
-share/icons/hicolor/16x16/actions/mypaint-view-rotate.png
-share/icons/hicolor/16x16/actions/mypaint-view-zoom-less.png
-share/icons/hicolor/16x16/actions/mypaint-view-zoom-more.png
-share/icons/hicolor/16x16/actions/mypaint-view-zoom.png
+share/icons/hicolor/16x16/actions/mypaint-tool-rings-color-changer.png
+share/icons/hicolor/16x16/actions/mypaint-tool-wash-color-changer.png
 share/icons/hicolor/16x16/apps/mypaint.png
-share/icons/hicolor/22x22/actions/brush-blend-mode-eraser.png
-share/icons/hicolor/22x22/actions/brush-blend-mode-normal.png
-share/icons/hicolor/22x22/actions/mypaint-brush-blend-mode-alpha-lock.png
-share/icons/hicolor/22x22/actions/mypaint-brush-blend-mode-colorize.png
-share/icons/hicolor/22x22/actions/mypaint-brush-blend-mode-eraser.png
-share/icons/hicolor/22x22/actions/mypaint-brush-blend-mode-normal.png
-share/icons/hicolor/22x22/actions/mypaint-brush-blend-modes.png
-share/icons/hicolor/22x22/actions/mypaint-brush-mods-active.png
-share/icons/hicolor/22x22/actions/mypaint-brush-mods-inactive.png
-share/icons/hicolor/22x22/actions/mypaint-frame.png
-share/icons/hicolor/22x22/actions/mypaint-line-mode-ellipse.png
-share/icons/hicolor/22x22/actions/mypaint-line-mode-freehand.png
-share/icons/hicolor/22x22/actions/mypaint-line-mode-sequence.png
-share/icons/hicolor/22x22/actions/mypaint-line-mode-straight.png
-share/icons/hicolor/22x22/actions/mypaint-line-mode.png
-share/icons/hicolor/22x22/actions/mypaint-move.png
-share/icons/hicolor/22x22/actions/mypaint-symmetry.png
-share/icons/hicolor/22x22/actions/mypaint-tool-brush.png
+share/icons/hicolor/22x22/actions/mypaint-tool-color-palette.png
 share/icons/hicolor/22x22/actions/mypaint-tool-color-rgb.png
-share/icons/hicolor/22x22/actions/mypaint-tool-color-triangle.png
 share/icons/hicolor/22x22/actions/mypaint-tool-component-sliders.png
+share/icons/hicolor/22x22/actions/mypaint-tool-crossed-bowl-color-changer.png
 share/icons/hicolor/22x22/actions/mypaint-tool-hcywheel.png
 share/icons/hicolor/22x22/actions/mypaint-tool-hsvcube.png
+share/icons/hicolor/22x22/actions/mypaint-tool-hsvsquare.png
 share/icons/hicolor/22x22/actions/mypaint-tool-hsvwheel.png
 share/icons/hicolor/22x22/actions/mypaint-tool-hue-wheel.png
-share/icons/hicolor/22x22/actions/mypaint-tool-layers.png
-share/icons/hicolor/22x22/actions/mypaint-tool-move-layer.png
-share/icons/hicolor/22x22/actions/mypaint-tool-paint-color.png
-share/icons/hicolor/22x22/actions/mypaint-tool-scratchpad.png
-share/icons/hicolor/22x22/actions/mypaint-view-100.png
-share/icons/hicolor/22x22/actions/mypaint-view-fit.png
-share/icons/hicolor/22x22/actions/mypaint-view-mirror-horizontal.png
-share/icons/hicolor/22x22/actions/mypaint-view-mirror-vertical.png
-share/icons/hicolor/22x22/actions/mypaint-view-pan.png
-share/icons/hicolor/22x22/actions/mypaint-view-rotate-anticlockwise.png
-share/icons/hicolor/22x22/actions/mypaint-view-rotate-clockwise.png
-share/icons/hicolor/22x22/actions/mypaint-view-rotate.png
-share/icons/hicolor/22x22/actions/mypaint-view-zoom-less.png
-share/icons/hicolor/22x22/actions/mypaint-view-zoom-more.png
-share/icons/hicolor/22x22/actions/mypaint-view-zoom.png
+share/icons/hicolor/22x22/actions/mypaint-tool-rings-color-changer.png
+share/icons/hicolor/22x22/actions/mypaint-tool-wash-color-changer.png
 share/icons/hicolor/22x22/apps/mypaint.png
-share/icons/hicolor/24x24/actions/brush-blend-mode-eraser.png
-share/icons/hicolor/24x24/actions/brush-blend-mode-normal.png
-share/icons/hicolor/24x24/actions/mypaint-brush-blend-mode-alpha-lock.png
-share/icons/hicolor/24x24/actions/mypaint-brush-blend-mode-colorize.png
-share/icons/hicolor/24x24/actions/mypaint-brush-blend-mode-eraser.png
-share/icons/hicolor/24x24/actions/mypaint-brush-blend-mode-normal.png
-share/icons/hicolor/24x24/actions/mypaint-brush-blend-modes.png
-share/icons/hicolor/24x24/actions/mypaint-brush-mods-active.png
-share/icons/hicolor/24x24/actions/mypaint-brush-mods-inactive.png
-share/icons/hicolor/24x24/actions/mypaint-frame.png
-share/icons/hicolor/24x24/actions/mypaint-line-mode-ellipse.png
-share/icons/hicolor/24x24/actions/mypaint-line-mode-freehand.png
-share/icons/hicolor/24x24/actions/mypaint-line-mode-sequence.png
-share/icons/hicolor/24x24/actions/mypaint-line-mode-straight.png
-share/icons/hicolor/24x24/actions/mypaint-line-mode.png
-share/icons/hicolor/24x24/actions/mypaint-move.png
-share/icons/hicolor/24x24/actions/mypaint-symmetry.png
-share/icons/hicolor/24x24/actions/mypaint-tool-brush.png
+share/icons/hicolor/24x24/actions/mypaint-add-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-brush-blend-modes-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-brush-stroke-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-brush-tip-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-colorize-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-colors-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-compositing-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-document-properties-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-down-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-edit-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-eraser-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-expander-collapsed-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-expander-expanded-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-fill-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-frame-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-layer-move-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-layer-vector-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-layers-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-left-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-lock-alpha-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-object-move-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-paint-over-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-painting-context-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-pick-color-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-remove-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-right-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-scrap-next-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-scrap-prev-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-scrap-save-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-scratchpad-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-stroke-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-symmetry-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-target-brush-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-target-layer-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-target-stroke-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-tool-color-palette.png
 share/icons/hicolor/24x24/actions/mypaint-tool-color-rgb.png
-share/icons/hicolor/24x24/actions/mypaint-tool-color-triangle.png
 share/icons/hicolor/24x24/actions/mypaint-tool-component-sliders.png
+share/icons/hicolor/24x24/actions/mypaint-tool-crossed-bowl-color-changer.png
 share/icons/hicolor/24x24/actions/mypaint-tool-hcywheel.png
 share/icons/hicolor/24x24/actions/mypaint-tool-hsvcube.png
+share/icons/hicolor/24x24/actions/mypaint-tool-hsvsquare.png
 share/icons/hicolor/24x24/actions/mypaint-tool-hsvwheel.png
 share/icons/hicolor/24x24/actions/mypaint-tool-hue-wheel.png
-share/icons/hicolor/24x24/actions/mypaint-tool-layers.png
-share/icons/hicolor/24x24/actions/mypaint-tool-move-layer.png
-share/icons/hicolor/24x24/actions/mypaint-tool-paint-color.png
-share/icons/hicolor/24x24/actions/mypaint-tool-scratchpad.png
-share/icons/hicolor/24x24/actions/mypaint-view-100.png
-share/icons/hicolor/24x24/actions/mypaint-view-fit.png
-share/icons/hicolor/24x24/actions/mypaint-view-mirror-horizontal.png
-share/icons/hicolor/24x24/actions/mypaint-view-mirror-vertical.png
-share/icons/hicolor/24x24/actions/mypaint-view-pan.png
-share/icons/hicolor/24x24/actions/mypaint-view-rotate-anticlockwise.png
-share/icons/hicolor/24x24/actions/mypaint-view-rotate-clockwise.png
-share/icons/hicolor/24x24/actions/mypaint-view-rotate.png
-share/icons/hicolor/24x24/actions/mypaint-view-zoom-less.png
-share/icons/hicolor/24x24/actions/mypaint-view-zoom-more.png
-share/icons/hicolor/24x24/actions/mypaint-view-zoom.png
+share/icons/hicolor/24x24/actions/mypaint-tool-inking-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-tool-rings-color-changer.png
+share/icons/hicolor/24x24/actions/mypaint-tool-wash-color-changer.png
+share/icons/hicolor/24x24/actions/mypaint-up-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-view-100-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-view-fit-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-view-mirror-horizontal-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-view-mirror-vertical-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-view-pan-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-view-rotate-anticlockwise-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-view-rotate-clockwise-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-view-rotate-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-view-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-view-zoom-less-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-view-zoom-more-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-view-zoom-symbolic.svg
 share/icons/hicolor/24x24/apps/mypaint.png
-share/icons/hicolor/32x32/actions/brush-blend-mode-eraser.png
-share/icons/hicolor/32x32/actions/brush-blend-mode-normal.png
-share/icons/hicolor/32x32/actions/mypaint-brush-blend-mode-alpha-lock.png
-share/icons/hicolor/32x32/actions/mypaint-brush-blend-mode-colorize.png
-share/icons/hicolor/32x32/actions/mypaint-brush-blend-mode-eraser.png
-share/icons/hicolor/32x32/actions/mypaint-brush-blend-mode-normal.png
-share/icons/hicolor/32x32/actions/mypaint-brush-blend-modes.png
-share/icons/hicolor/32x32/actions/mypaint-brush-mods-active.png
-share/icons/hicolor/32x32/actions/mypaint-brush-mods-inactive.png
-share/icons/hicolor/32x32/actions/mypaint-frame.png
-share/icons/hicolor/32x32/actions/mypaint-line-mode-ellipse.png
-share/icons/hicolor/32x32/actions/mypaint-line-mode-freehand.png
-share/icons/hicolor/32x32/actions/mypaint-line-mode-sequence.png
-share/icons/hicolor/32x32/actions/mypaint-line-mode-straight.png
-share/icons/hicolor/32x32/actions/mypaint-line-mode.png
-share/icons/hicolor/32x32/actions/mypaint-move.png
-share/icons/hicolor/32x32/actions/mypaint-symmetry.png
-share/icons/hicolor/32x32/actions/mypaint-tool-brush.png
+share/icons/hicolor/256x256/apps/mypaint.png
+share/icons/hicolor/32x32/actions/mypaint-tool-color-palette.png
 share/icons/hicolor/32x32/actions/mypaint-tool-color-rgb.png
-share/icons/hicolor/32x32/actions/mypaint-tool-color-triangle.png
 share/icons/hicolor/32x32/actions/mypaint-tool-component-sliders.png
+share/icons/hicolor/32x32/actions/mypaint-tool-crossed-bowl-color-changer.png
 share/icons/hicolor/32x32/actions/mypaint-tool-hcywheel.png
 share/icons/hicolor/32x32/actions/mypaint-tool-hsvcube.png
+share/icons/hicolor/32x32/actions/mypaint-tool-hsvsquare.png
 share/icons/hicolor/32x32/actions/mypaint-tool-hsvwheel.png
 share/icons/hicolor/32x32/actions/mypaint-tool-hue-wheel.png
-share/icons/hicolor/32x32/actions/mypaint-tool-layers.png
-share/icons/hicolor/32x32/actions/mypaint-tool-move-layer.png
-share/icons/hicolor/32x32/actions/mypaint-tool-paint-color.png
-share/icons/hicolor/32x32/actions/mypaint-tool-scratchpad.png
-share/icons/hicolor/32x32/actions/mypaint-view-100.png
-share/icons/hicolor/32x32/actions/mypaint-view-fit.png
-share/icons/hicolor/32x32/actions/mypaint-view-mirror-horizontal.png
-share/icons/hicolor/32x32/actions/mypaint-view-mirror-vertical.png
-share/icons/hicolor/32x32/actions/mypaint-view-pan.png
-share/icons/hicolor/32x32/actions/mypaint-view-rotate-anticlockwise.png
-share/icons/hicolor/32x32/actions/mypaint-view-rotate-clockwise.png
-share/icons/hicolor/32x32/actions/mypaint-view-rotate.png
-share/icons/hicolor/32x32/actions/mypaint-view-zoom-less.png
-share/icons/hicolor/32x32/actions/mypaint-view-zoom-more.png
-share/icons/hicolor/32x32/actions/mypaint-view-zoom.png
+share/icons/hicolor/32x32/actions/mypaint-tool-rings-color-changer.png
+share/icons/hicolor/32x32/actions/mypaint-tool-wash-color-changer.png
 share/icons/hicolor/32x32/apps/mypaint.png
-share/icons/hicolor/48x48/actions/brush-blend-mode-normal.png
-share/icons/hicolor/48x48/actions/mypaint-brush-blend-mode-alpha-lock.png
-share/icons/hicolor/48x48/actions/mypaint-brush-blend-mode-colorize.png
-share/icons/hicolor/48x48/actions/mypaint-brush-blend-mode-eraser.png
-share/icons/hicolor/48x48/actions/mypaint-brush-blend-mode-normal.png
-share/icons/hicolor/48x48/actions/mypaint-brush-blend-modes.png
-share/icons/hicolor/48x48/actions/mypaint-brush-mods-active.png
-share/icons/hicolor/48x48/actions/mypaint-brush-mods-inactive.png
-share/icons/hicolor/48x48/actions/mypaint-frame.png
-share/icons/hicolor/48x48/actions/mypaint-line-mode-ellipse.png
-share/icons/hicolor/48x48/actions/mypaint-line-mode-freehand.png
-share/icons/hicolor/48x48/actions/mypaint-line-mode-sequence.png
-share/icons/hicolor/48x48/actions/mypaint-line-mode-straight.png
-share/icons/hicolor/48x48/actions/mypaint-line-mode.png
-share/icons/hicolor/48x48/actions/mypaint-move.png
-share/icons/hicolor/48x48/actions/mypaint-symmetry.png
-share/icons/hicolor/48x48/actions/mypaint-tool-brush.png
+share/icons/hicolor/48x48/actions/mypaint-tool-color-palette.png
 share/icons/hicolor/48x48/actions/mypaint-tool-color-rgb.png
-share/icons/hicolor/48x48/actions/mypaint-tool-color-triangle.png
 share/icons/hicolor/48x48/actions/mypaint-tool-component-sliders.png
+share/icons/hicolor/48x48/actions/mypaint-tool-crossed-bowl-color-changer.png
 share/icons/hicolor/48x48/actions/mypaint-tool-hcywheel.png
 share/icons/hicolor/48x48/actions/mypaint-tool-hsvcube.png
+share/icons/hicolor/48x48/actions/mypaint-tool-hsvsquare.png
 share/icons/hicolor/48x48/actions/mypaint-tool-hsvwheel.png
 share/icons/hicolor/48x48/actions/mypaint-tool-hue-wheel.png
-share/icons/hicolor/48x48/actions/mypaint-tool-layers.png
-share/icons/hicolor/48x48/actions/mypaint-tool-move-layer.png
-share/icons/hicolor/48x48/actions/mypaint-tool-paint-color.png
-share/icons/hicolor/48x48/actions/mypaint-tool-scratchpad.png
-share/icons/hicolor/48x48/actions/mypaint-view-100.png
-share/icons/hicolor/48x48/actions/mypaint-view-fit.png
-share/icons/hicolor/48x48/actions/mypaint-view-mirror-horizontal.png
-share/icons/hicolor/48x48/actions/mypaint-view-mirror-vertical.png
-share/icons/hicolor/48x48/actions/mypaint-view-pan.png
-share/icons/hicolor/48x48/actions/mypaint-view-rotate-anticlockwise.png
-share/icons/hicolor/48x48/actions/mypaint-view-rotate-clockwise.png
-share/icons/hicolor/48x48/actions/mypaint-view-rotate.png
-share/icons/hicolor/48x48/actions/mypaint-view-zoom-less.png
-share/icons/hicolor/48x48/actions/mypaint-view-zoom-more.png
-share/icons/hicolor/48x48/actions/mypaint-view-zoom.png
+share/icons/hicolor/48x48/actions/mypaint-tool-rings-color-changer.png
+share/icons/hicolor/48x48/actions/mypaint-tool-wash-color-changer.png
 share/icons/hicolor/48x48/apps/mypaint.png
-share/icons/hicolor/scalable/actions/mypaint-brush-blend-mode-alpha-lock.svg
-share/icons/hicolor/scalable/actions/mypaint-brush-blend-mode-colorize.svg
-share/icons/hicolor/scalable/actions/mypaint-brush-blend-mode-eraser.svg
-share/icons/hicolor/scalable/actions/mypaint-brush-blend-mode-normal.svg
-share/icons/hicolor/scalable/actions/mypaint-brush-blend-modes.svg
-share/icons/hicolor/scalable/actions/mypaint-brush-mods-active.svg
-share/icons/hicolor/scalable/actions/mypaint-brush-mods-inactive.svg
-share/icons/hicolor/scalable/actions/mypaint-frame.svg
-share/icons/hicolor/scalable/actions/mypaint-line-mode-ellipse.svg
-share/icons/hicolor/scalable/actions/mypaint-line-mode-freehand.svg
-share/icons/hicolor/scalable/actions/mypaint-line-mode-sequence.svg
-share/icons/hicolor/scalable/actions/mypaint-line-mode-straight.svg
-share/icons/hicolor/scalable/actions/mypaint-line-mode.svg
-share/icons/hicolor/scalable/actions/mypaint-move.svg
+share/icons/hicolor/512x512/apps/mypaint.png
+share/icons/hicolor/scalable/actions/mypaint-about-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-add-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-bookmark-new-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-brush-blend-modes-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-brush-stroke-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-brush-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-brush-tip-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-brushes-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-clear-all-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-close-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-colorize-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-colors-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-compositing-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-copy-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-cut-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-delete-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-document-export-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-document-new-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-document-open-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-document-properties-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-document-revert-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-document-save-as-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-document-save-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-down-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-duplicate-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-edit-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-ellipse-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-eraser-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-expander-collapsed-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-expander-expanded-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-file-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-fill-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-frame-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-freehand-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-fullscreen-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-globe-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-help-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-history-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-info-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-above-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-below-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-clone-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-delete-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-fallback-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-group-new-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-group-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-lower-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-merge-down-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-move-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-new-below-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-new-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-painting-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-raise-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-vector-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layers-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-left-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-line-sequence-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-lines-and-curves-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-lock-alpha-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-normal-paint-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-object-hidden-insensitive-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-object-hidden-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-object-locked-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-object-move-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-object-unlocked-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-object-visible-insensitive-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-object-visible-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-ok-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-options-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-paint-over-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-painting-context-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-paste-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-pick-color-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-quit-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-redo-ltr-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-redo-rtl-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-remove-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-right-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-run-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-scrap-next-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-scrap-prev-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-scrap-save-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-scratchpad-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-stroke-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-symmetry-symbolic.svg
 share/icons/hicolor/scalable/actions/mypaint-symmetry.svg
-share/icons/hicolor/scalable/actions/mypaint-tool-brush.svg
+share/icons/hicolor/scalable/actions/mypaint-tab-options-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-target-brush-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-target-layer-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-target-stroke-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-target-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-tool-color-palette.svg
 share/icons/hicolor/scalable/actions/mypaint-tool-color-rgb.svg
-share/icons/hicolor/scalable/actions/mypaint-tool-color-triangle.svg
 share/icons/hicolor/scalable/actions/mypaint-tool-component-sliders.svg
 share/icons/hicolor/scalable/actions/mypaint-tool-hcywheel.svg
 share/icons/hicolor/scalable/actions/mypaint-tool-hsvcube.svg
 share/icons/hicolor/scalable/actions/mypaint-tool-hsvwheel.svg
 share/icons/hicolor/scalable/actions/mypaint-tool-hue-wheel.svg
-share/icons/hicolor/scalable/actions/mypaint-tool-layers.svg
-share/icons/hicolor/scalable/actions/mypaint-tool-move-layer.svg
-share/icons/hicolor/scalable/actions/mypaint-tool-paint-color.svg
-share/icons/hicolor/scalable/actions/mypaint-tool-scratchpad.svg
-share/icons/hicolor/scalable/actions/mypaint-view-100.svg
-share/icons/hicolor/scalable/actions/mypaint-view-fit.svg
-share/icons/hicolor/scalable/actions/mypaint-view-mirror-horizontal.svg
-share/icons/hicolor/scalable/actions/mypaint-view-mirror-vertical.svg
-share/icons/hicolor/scalable/actions/mypaint-view-pan.svg
-share/icons/hicolor/scalable/actions/mypaint-view-rotate-anticlockwise.svg
-share/icons/hicolor/scalable/actions/mypaint-view-rotate-clockwise.svg
-share/icons/hicolor/scalable/actions/mypaint-view-rotate.svg
-share/icons/hicolor/scalable/actions/mypaint-view-zoom-less.svg
-share/icons/hicolor/scalable/actions/mypaint-view-zoom-more.svg
-share/icons/hicolor/scalable/actions/mypaint-view-zoom.svg
-share/icons/hicolor/scalable/apps/mypaint.svg
+share/icons/hicolor/scalable/actions/mypaint-tool-inking-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-trash-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-undo-ltr-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-undo-rtl-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-unfullscreen-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-up-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-view-100-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-view-fit-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-view-mirror-horizontal-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-view-mirror-vertical-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-view-pan-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-view-rotate-anticlockwise-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-view-rotate-clockwise-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-view-rotate-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-view-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-view-zoom-less-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-view-zoom-more-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-view-zoom-symbolic.svg
+share/libmypaint/__init__.py
+share/libmypaint/brushsettings.json
+share/libmypaint/brushsettings.py
+share/libmypaint/generate.py
+share/locale/ar_AR/LC_MESSAGES/libmypaint.mo
+share/locale/brx/LC_MESSAGES/mypaint.mo
+share/locale/ca/LC_MESSAGES/libmypaint.mo
+share/locale/ca/LC_MESSAGES/mypaint.mo
 share/locale/cs/LC_MESSAGES/libmypaint.mo
 share/locale/cs/LC_MESSAGES/mypaint.mo
+share/locale/da/LC_MESSAGES/libmypaint.mo
+share/locale/da/LC_MESSAGES/mypaint.mo
 share/locale/de/LC_MESSAGES/libmypaint.mo
 share/locale/de/LC_MESSAGES/mypaint.mo
+share/locale/el/LC_MESSAGES/mypaint.mo
 share/locale/en_CA/LC_MESSAGES/libmypaint.mo
 share/locale/en_CA/LC_MESSAGES/mypaint.mo
+share/locale/en_GB/LC_MESSAGES/libmypaint.mo
 share/locale/en_GB/LC_MESSAGES/mypaint.mo
 share/locale/es/LC_MESSAGES/libmypaint.mo
 share/locale/es/LC_MESSAGES/mypaint.mo
+share/locale/fa/LC_MESSAGES/libmypaint.mo
+share/locale/fa/LC_MESSAGES/mypaint.mo
+share/locale/fi/LC_MESSAGES/libmypaint.mo
 share/locale/fr/LC_MESSAGES/libmypaint.mo
 share/locale/fr/LC_MESSAGES/mypaint.mo
+share/locale/he/LC_MESSAGES/libmypaint.mo
+share/locale/he/LC_MESSAGES/mypaint.mo
 share/locale/hu/LC_MESSAGES/libmypaint.mo
 share/locale/hu/LC_MESSAGES/mypaint.mo
 share/locale/id/LC_MESSAGES/libmypaint.mo
@@ -289,10 +297,16 @@ share/locale/ro/LC_MESSAGES/libmypaint.mo
 share/locale/ro/LC_MESSAGES/mypaint.mo
 share/locale/ru/LC_MESSAGES/libmypaint.mo
 share/locale/ru/LC_MESSAGES/mypaint.mo
+share/locale/sc/LC_MESSAGES/libmypaint.mo
+share/locale/sk/LC_MESSAGES/libmypaint.mo
+share/locale/sk/LC_MESSAGES/mypaint.mo
 share/locale/sl/LC_MESSAGES/libmypaint.mo
 share/locale/sl/LC_MESSAGES/mypaint.mo
+share/locale/sr@cyrillic/LC_MESSAGES/mypaint.mo
 share/locale/sv/LC_MESSAGES/libmypaint.mo
 share/locale/sv/LC_MESSAGES/mypaint.mo
+share/locale/tr/LC_MESSAGES/libmypaint.mo
+share/locale/tr/LC_MESSAGES/mypaint.mo
 share/locale/uk/LC_MESSAGES/libmypaint.mo
 share/locale/uk/LC_MESSAGES/mypaint.mo
 share/locale/zh_CN/LC_MESSAGES/libmypaint.mo
@@ -310,7 +324,7 @@ share/locale/zh_TW/LC_MESSAGES/mypaint.mo
 %%DATADIR%%/backgrounds/11_weak_blue.png
 %%DATADIR%%/backgrounds/50_comicthumbs.png
 %%DATADIR%%/backgrounds/50_storyboard-template.png
-%%DATADIR%%/backgrounds/README
+%%DATADIR%%/backgrounds/README.md
 %%DATADIR%%/backgrounds/canvas1_1.png
 %%DATADIR%%/backgrounds/canvas1_2.png
 %%DATADIR%%/backgrounds/canvas1_3.png
@@ -318,7 +332,6 @@ share/locale/zh_TW/LC_MESSAGES/mypaint.mo
 %%DATADIR%%/backgrounds/canvas3_1.png
 %%DATADIR%%/backgrounds/canvas3_2.png
 %%DATADIR%%/backgrounds/canvas3_3.png
-%%DATADIR%%/backgrounds/default.png
 %%DATADIR%%/backgrounds/mrmamurk/MrMamurk_readme.txt
 %%DATADIR%%/backgrounds/mrmamurk/mamurk_a_1.png
 %%DATADIR%%/backgrounds/mrmamurk/mamurk_a_2.png
@@ -596,6 +609,47 @@ share/locale/zh_TW/LC_MESSAGES/mypaint.mo
 %%DATADIR%%/brushes/experimental/subtle_pencil_prev.png
 %%DATADIR%%/brushes/experimental/track.myb
 %%DATADIR%%/brushes/experimental/track_prev.png
+%%DATADIR%%/brushes/kaerhon_v1/Airbrush_a.myb
+%%DATADIR%%/brushes/kaerhon_v1/Airbrush_a_prev.png
+%%DATADIR%%/brushes/kaerhon_v1/Dirty_Transparent_sk.myb
+%%DATADIR%%/brushes/kaerhon_v1/Dirty_Transparent_sk_prev.png
+%%DATADIR%%/brushes/kaerhon_v1/ReadMe.txt
+%%DATADIR%%/brushes/kaerhon_v1/Sketcher2_sk.myb
+%%DATADIR%%/brushes/kaerhon_v1/Sketcher2_sk_prev.png
+%%DATADIR%%/brushes/kaerhon_v1/Smear_sm.myb
+%%DATADIR%%/brushes/kaerhon_v1/Smear_sm_prev.png
+%%DATADIR%%/brushes/kaerhon_v1/airbruch_press_a.myb
+%%DATADIR%%/brushes/kaerhon_v1/airbruch_press_a_prev.png
+%%DATADIR%%/brushes/kaerhon_v1/airsmudge_a.myb
+%%DATADIR%%/brushes/kaerhon_v1/airsmudge_a_prev.png
+%%DATADIR%%/brushes/kaerhon_v1/airsmudgeultimate_sk.myb
+%%DATADIR%%/brushes/kaerhon_v1/airsmudgeultimate_sk_prev.png
+%%DATADIR%%/brushes/kaerhon_v1/classic_sk.myb
+%%DATADIR%%/brushes/kaerhon_v1/classic_sk_prev.png
+%%DATADIR%%/brushes/kaerhon_v1/classicroundblock_static_c.myb
+%%DATADIR%%/brushes/kaerhon_v1/classicroundblock_static_c_prev.png
+%%DATADIR%%/brushes/kaerhon_v1/extreme_round_l.myb
+%%DATADIR%%/brushes/kaerhon_v1/extreme_round_l_prev.png
+%%DATADIR%%/brushes/kaerhon_v1/fill_c.myb
+%%DATADIR%%/brushes/kaerhon_v1/fill_c_prev.png
+%%DATADIR%%/brushes/kaerhon_v1/flat_bar_l.myb
+%%DATADIR%%/brushes/kaerhon_v1/flat_bar_l_prev.png
+%%DATADIR%%/brushes/kaerhon_v1/ink-slowline_s.myb
+%%DATADIR%%/brushes/kaerhon_v1/ink-slowline_s_prev.png
+%%DATADIR%%/brushes/kaerhon_v1/ink_slow_s.myb
+%%DATADIR%%/brushes/kaerhon_v1/ink_slow_s_prev.png
+%%DATADIR%%/brushes/kaerhon_v1/inkster_l.myb
+%%DATADIR%%/brushes/kaerhon_v1/inkster_l_prev.png
+%%DATADIR%%/brushes/kaerhon_v1/paint_barrr_sm.myb
+%%DATADIR%%/brushes/kaerhon_v1/paint_barrr_sm_prev.png
+%%DATADIR%%/brushes/kaerhon_v1/paint_radius_2_sm.myb
+%%DATADIR%%/brushes/kaerhon_v1/paint_radius_2_sm_prev.png
+%%DATADIR%%/brushes/kaerhon_v1/paint_sm.myb
+%%DATADIR%%/brushes/kaerhon_v1/paint_sm_prev.png
+%%DATADIR%%/brushes/kaerhon_v1/smudge_ink(0.7)_sm.myb
+%%DATADIR%%/brushes/kaerhon_v1/smudge_ink(0.7)_sm_prev.png
+%%DATADIR%%/brushes/kaerhon_v1/wet_paint_sm.myb
+%%DATADIR%%/brushes/kaerhon_v1/wet_paint_sm_prev.png
 %%DATADIR%%/brushes/label-brush-mypaint.sh
 %%DATADIR%%/brushes/order.conf
 %%DATADIR%%/brushes/prev-template.xcf.gz
@@ -725,66 +779,86 @@ share/locale/zh_TW/LC_MESSAGES/mypaint.mo
 %%DATADIR%%/brushes/tanda/watercolor-02-paint_prev.png
 %%DATADIR%%/brushes/tanda/watercolor-02-water.myb
 %%DATADIR%%/brushes/tanda/watercolor-02-water_prev.png
-%%DATADIR%%/brushlib/__init__.py
-%%DATADIR%%/brushlib/brushsettings.json
-%%DATADIR%%/brushlib/brushsettings.py
-%%DATADIR%%/brushlib/generate.py
 %%DATADIR%%/gui/__init__.py
+%%DATADIR%%/gui/accelmap.py
 %%DATADIR%%/gui/application.py
+%%DATADIR%%/gui/autorecover.glade
+%%DATADIR%%/gui/autorecover.py
 %%DATADIR%%/gui/backgroundwindow.py
-%%DATADIR%%/gui/brushcreationwidget.py
+%%DATADIR%%/gui/brushcolor.py
+%%DATADIR%%/gui/brusheditor.glade
+%%DATADIR%%/gui/brusheditor.py
+%%DATADIR%%/gui/brushiconeditor.py
 %%DATADIR%%/gui/brushmanager.py
 %%DATADIR%%/gui/brushmodifier.py
 %%DATADIR%%/gui/brushselectionwindow.py
-%%DATADIR%%/gui/brushsettingswindow.py
+%%DATADIR%%/gui/builderhacks.py
 %%DATADIR%%/gui/buttonmap.py
-%%DATADIR%%/gui/canvasevent.py
 %%DATADIR%%/gui/colorpicker.py
+%%DATADIR%%/gui/colorpreview.py
 %%DATADIR%%/gui/colors/__init__.py
 %%DATADIR%%/gui/colors/adjbases.py
 %%DATADIR%%/gui/colors/bases.py
+%%DATADIR%%/gui/colors/changers.py
 %%DATADIR%%/gui/colors/combined.py
-%%DATADIR%%/gui/colors/geom.py
 %%DATADIR%%/gui/colors/hcywheel.py
 %%DATADIR%%/gui/colors/hsvcube.py
-%%DATADIR%%/gui/colors/hsvtriangle.py
+%%DATADIR%%/gui/colors/hsvsquare.py
 %%DATADIR%%/gui/colors/hsvwheel.py
-%%DATADIR%%/gui/colors/palette.py
 %%DATADIR%%/gui/colors/paletteview.py
-%%DATADIR%%/gui/colors/picker.py
 %%DATADIR%%/gui/colors/sliders.py
-%%DATADIR%%/gui/colors/uicolor.py
 %%DATADIR%%/gui/colors/uimisc.py
 %%DATADIR%%/gui/colors/util.py
-%%DATADIR%%/gui/colorselectionwindow.py
-%%DATADIR%%/gui/colorwindow.py
+%%DATADIR%%/gui/colortools.py
 %%DATADIR%%/gui/cursor.py
 %%DATADIR%%/gui/curve.py
+%%DATADIR%%/gui/device.py
 %%DATADIR%%/gui/dialogs.py
+%%DATADIR%%/gui/displayfilter.py
 %%DATADIR%%/gui/document.py
+%%DATADIR%%/gui/drawutils.py
 %%DATADIR%%/gui/drawwindow.py
-%%DATADIR%%/gui/dropdownpanel.py
-%%DATADIR%%/gui/elastic.py
+%%DATADIR%%/gui/externalapp.py
+%%DATADIR%%/gui/factoryaction.py
 %%DATADIR%%/gui/filehandling.py
+%%DATADIR%%/gui/fill.py
+%%DATADIR%%/gui/footer.py
 %%DATADIR%%/gui/framewindow.py
-%%DATADIR%%/gui/functionwindow.py
+%%DATADIR%%/gui/freehand.py
+%%DATADIR%%/gui/gtk2compat.py
 %%DATADIR%%/gui/gtkexcepthook.py
+%%DATADIR%%/gui/history.py
 %%DATADIR%%/gui/historypopup.py
+%%DATADIR%%/gui/inktool.glade
+%%DATADIR%%/gui/inktool.py
 %%DATADIR%%/gui/inputtestwindow.py
 %%DATADIR%%/gui/keyboard.py
+%%DATADIR%%/gui/layermanip.py
+%%DATADIR%%/gui/layermodes.py
+%%DATADIR%%/gui/layers.py
 %%DATADIR%%/gui/layerswindow.py
-%%DATADIR%%/gui/layout.py
+%%DATADIR%%/gui/layerswindow.xml
 %%DATADIR%%/gui/linemode.py
 %%DATADIR%%/gui/main.py
 %%DATADIR%%/gui/menu.xml
-%%DATADIR%%/gui/mypaint.xml
+%%DATADIR%%/gui/meta.py
+%%DATADIR%%/gui/mode.py
+%%DATADIR%%/gui/mypaint.glade
+%%DATADIR%%/gui/objfactory.py
+%%DATADIR%%/gui/optionspanel.py
 %%DATADIR%%/gui/overlays.py
+%%DATADIR%%/gui/picker.py
 %%DATADIR%%/gui/pixbuflist.py
+%%DATADIR%%/gui/preferenceswindow.glade
 %%DATADIR%%/gui/preferenceswindow.py
-%%DATADIR%%/gui/pygtkcompat.py
+%%DATADIR%%/gui/previewwindow.py
+%%DATADIR%%/gui/profiling.py
+%%DATADIR%%/gui/quickchoice.py
+%%DATADIR%%/gui/resources.xml
 %%DATADIR%%/gui/scratchwindow.py
 %%DATADIR%%/gui/spinbox.py
 %%DATADIR%%/gui/stategroup.py
+%%DATADIR%%/gui/style.py
 %%DATADIR%%/gui/symmetry.py
 %%DATADIR%%/gui/tileddrawwidget.py
 %%DATADIR%%/gui/toolbar-blendmodes.xml
@@ -792,29 +866,53 @@ share/locale/zh_TW/LC_MESSAGES/mypaint.mo
 %%DATADIR%%/gui/toolbar-file.xml
 %%DATADIR%%/gui/toolbar-linemodes.xml
 %%DATADIR%%/gui/toolbar-scrap.xml
-%%DATADIR%%/gui/toolbar-subwindows.xml
 %%DATADIR%%/gui/toolbar-view-manips.xml
 %%DATADIR%%/gui/toolbar-view-modes.xml
 %%DATADIR%%/gui/toolbar-view-resets.xml
 %%DATADIR%%/gui/toolbar.py
 %%DATADIR%%/gui/toolbar.xml
+%%DATADIR%%/gui/topbar.py
+%%DATADIR%%/gui/uicolor.py
+%%DATADIR%%/gui/viewmanip.py
 %%DATADIR%%/gui/widgets.py
 %%DATADIR%%/gui/windowing.py
+%%DATADIR%%/gui/workspace.py
 %%DATADIR%%/lib/__init__.py
-%%DATADIR%%/lib/backgroundsurface.py
+%%DATADIR%%/lib/alg.py
+%%DATADIR%%/lib/autosave.py
 %%DATADIR%%/lib/brush.py
 %%DATADIR%%/lib/brushes_migrate_json.py
+%%DATADIR%%/lib/cache.py
+%%DATADIR%%/lib/color.py
 %%DATADIR%%/lib/command.py
 %%DATADIR%%/lib/document.py
+%%DATADIR%%/lib/errors.py
+%%DATADIR%%/lib/fileutils.py
+%%DATADIR%%/lib/gettext.py
+%%DATADIR%%/lib/gichecks.py
+%%DATADIR%%/lib/glib.py
 %%DATADIR%%/lib/helpers.py
+%%DATADIR%%/lib/i18n.py
 %%DATADIR%%/lib/idletask.py
-%%DATADIR%%/lib/layer.py
+%%DATADIR%%/lib/layer/__init__.py
+%%DATADIR%%/lib/layer/core.py
+%%DATADIR%%/lib/layer/data.py
+%%DATADIR%%/lib/layer/error.py
+%%DATADIR%%/lib/layer/group.py
+%%DATADIR%%/lib/layer/test.py
+%%DATADIR%%/lib/layer/tree.py
+%%DATADIR%%/lib/meta.py
+%%DATADIR%%/lib/modes.py
 %%DATADIR%%/lib/mypaintlib.py
+%%DATADIR%%/lib/observable.py
+%%DATADIR%%/lib/palette.py
+%%DATADIR%%/lib/pixbuf.py
 %%DATADIR%%/lib/pixbufsurface.py
-%%DATADIR%%/lib/scratchpad_palette.py
 %%DATADIR%%/lib/stroke.py
 %%DATADIR%%/lib/strokemap.py
+%%DATADIR%%/lib/surface.py
 %%DATADIR%%/lib/tiledsurface.py
+%%DATADIR%%/lib/xml.py
 %%DATADIR%%/palettes/All_color_choice.gpl
 %%DATADIR%%/palettes/Browns_And_Yellows.gpl
 %%DATADIR%%/palettes/Classic_4.gpl
@@ -835,6 +933,7 @@ share/locale/zh_TW/LC_MESSAGES/mypaint.mo
 %%DATADIR%%/palettes/Watercolor.gpl
 %%DATADIR%%/palettes/Zenburn.gpl
 %%DATADIR%%/pixmaps/crosshair_closed.png
+%%DATADIR%%/pixmaps/cursor_add.png
 %%DATADIR%%/pixmaps/cursor_arrow.png
 %%DATADIR%%/pixmaps/cursor_arrow_forbidden.png
 %%DATADIR%%/pixmaps/cursor_color_picker.png
@@ -848,11 +947,9 @@ share/locale/zh_TW/LC_MESSAGES/mypaint.mo
 %%DATADIR%%/pixmaps/cursor_move_nw_se.png
 %%DATADIR%%/pixmaps/cursor_move_w_e.png
 %%DATADIR%%/pixmaps/cursor_pencil.png
-%%DATADIR%%/pixmaps/eye_closed.png
-%%DATADIR%%/pixmaps/eye_open.png
+%%DATADIR%%/pixmaps/cursor_remove.png
 %%DATADIR%%/pixmaps/layer_duplicate.png
 %%DATADIR%%/pixmaps/layers.png
-%%DATADIR%%/pixmaps/lock_closed.png
-%%DATADIR%%/pixmaps/lock_open.png
 %%DATADIR%%/pixmaps/mypaint_logo.png
 %%DATADIR%%/pixmaps/plus.png
+share/thumbnailers/mypaint-ora.thumbnailer