[SCM] synfig-synfig/upstream: Imported Upstream version 1.0.2

onlyjob at users.alioth.debian.org onlyjob at users.alioth.debian.org
Fri Nov 27 12:06:06 UTC 2015


The following commit has been merged in the upstream branch:
commit 51d562429b04384475be67a581e4aa534b73ed28
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Fri Nov 27 21:01:22 2015 +1100

    Imported Upstream version 1.0.2

diff --git a/AUTHORS b/AUTHORS
index 375e2ac..663eb45 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -25,6 +25,7 @@ Diego Barrios Romero(eldruin)
 Bertrand Greorie (berteh)
 Ivan Mahonin
 Denis Zdorovtsov
+Max May (Permutatrix)
 
 Translators:
 
diff --git a/ChangeLog b/ChangeLog
index bed8df5..53446ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,112 @@
+2015-07-19  Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+	* synfig-core/configure.ac, synfig-core/po/ar.po,
+	synfig-core/po/bs.po, synfig-core/po/ca.po, synfig-core/po/cs.po,
+	synfig-core/po/cs_CZ.po, synfig-core/po/da.po,
+	synfig-core/po/de.po, synfig-core/po/el_GR.po,
+	synfig-core/po/en_CZ.po, synfig-core/po/en_GB.po,
+	synfig-core/po/es.po, synfig-core/po/eu.po,
+	synfig-core/po/eu_ES.po, synfig-core/po/fa_IR.po,
+	synfig-core/po/fr.po, synfig-core/po/gl.po, synfig-core/po/he.po,
+	synfig-core/po/hu.po, synfig-core/po/it.po,
+	synfig-core/po/ja_JP.po, synfig-core/po/lt.po,
+	synfig-core/po/nl.po, synfig-core/po/no_NO.po,
+	synfig-core/po/pl_PL.po, synfig-core/po/pt_BR.po,
+	synfig-core/po/ro.po, synfig-core/po/ru.po, synfig-core/po/si.po,
+	synfig-core/po/sk_SK.po, synfig-core/po/sr_RS.po,
+	synfig-core/po/sv_SE.po, synfig-core/po/tr.po,
+	synfig-core/po/ur.po, synfig-core/po/uz at Latn.po,
+	synfig-core/po/zh-Hant.po, synfig-core/po/zh_CN.po,
+	synfig-core/po/zh_TW.Big5.po, synfig-core/po/zh_TW.po: Update
+	translations
+
+2015-07-18  Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+	* synfig-core/m4/subs.m4: Fix "[" and "]" synbols to be preserved in
+	m4 template
+
+2015-07-05  [d.j.a.y] Jerome Blanchi <d.j.a.y at free.fr>
+
+	* synfig-core/src/synfig/target.h: Doc : Fix the comments for
+	doxygen
+
+2015-06-23  [d.j.a.y] Jerome Blanchi <d.j.a.y at free.fr>
+
+	* synfig-core/src/modules/mod_png/mptr_png.cpp: Optimization in
+	reading indexed png
+
+2015-06-23  [d.j.a.y] Jerome Blanchi <d.j.a.y at free.fr>
+
+	* synfig-core/src/modules/mod_png/mptr_png.cpp: Fix #110 : Alpha bug
+	with indexed images Assign alpha only when valid and with the good alpha value.  (thank's to pngpixel.c example from Aros project)
+
+2015-06-22  Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+	* synfig-core/m4/subs.m4: Fix issue in e3a2635979
+
+2015-06-22  Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+	* synfig-core/configure.ac: If synfigstudio.spec has just
+	"BuildRequires: pkgconfig(synfig)" some required libs will not be
+	installed. In my case "pkgconfig(Magick++)".  As a result linking
+	failed.  Put more libs into CONFIG_DEPS to automatically install them if
+	synfig-devel is installed.  Signed-off-by: Olaf Hering <olaf at aepfle.de>
+
+2015-06-22  Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+	* synfig-core/src/modules/lyr_freetype/lyr_freetype.cpp: If
+	FcFontList returns an empty FcFontSet synfig will crash because
+	fs->fonts is a NULL pointer. Avoid that crash by checking the number
+	of returned fonts.  Signed-off-by: Olaf Hering <olaf at aepfle.de>
+
+2015-06-22  Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+	* synfig-core/m4/subs.m4: Make sure to remove complex debugging
+	options (like "-grecord-gcc-switches") if debug mode is off
+
+2015-05-08  Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+	* synfig-core/m4/subs.m4: Correct substitution expression for debug
+	mode
+
+2015-05-08  Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+	* synfig-core/configure.ac: Bump version of ETL
+
+2015-05-08  Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+	* synfig-core/configure.ac, synfig-core/m4/subs.m4: Fix debug mode
+	scripts for synfig-core
+
+2015-05-05  Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+	* synfig-core/configure.ac: Use different version number for now
+
+2015-05-02  [d.j.a.y] Jerome Blanchi <d.j.a.y at free.fr>
+
+	* synfig-core/src/synfig/keyframe.h: Keyframe UI - Fix #861 -
+	Keyframe dialog not updated (progress4) * keyframe class : waypoint::model getters
+
+2015-05-02  [d.j.a.y] Jerome Blanchi <d.j.a.y at free.fr>
+
+	* synfig-core/src/synfig/keyframe.cpp: Keyframe UI - Fix #861 -
+	Keyframe dialog not updated (progress3) * Missing Waypoint::Model flags
+
+2015-05-01  [d.j.a.y] Jerome Blanchi <d.j.a.y at free.fr>
+
+	* synfig-core/src/synfig/keyframe.cpp,
+	synfig-core/src/synfig/keyframe.h: Keyframe UI - Fix #861 - Keyframe
+	dialog not updated (progress1) * Add initial Waypoint::Model support to Keyframe
+
+2015-04-08  Ivan Mahonin <bh at icystar.com>
+
+	* synfig-core/src/synfig/layers/layer_pastecanvas.cpp: Fix
+	layer_pastecanvas
+
+2015-04-06  Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+	* synfig-core/po/POTFILES.in: Fix POTFILES.in
+
 2015-04-06  Konstantin Dmitriev <ksee.zelgadis at gmail.com>
 
 	* synfig-core/src/synfig/color/Makefile_insert: Add missing file
@@ -408,6 +517,88 @@
 	synfig-core/src/synfig/waypoint.cpp: Move valuenodes into
 	synfig/valuenodes folder
 
+2015-05-01  Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+	* synfig-core/configure.ac: Bump intermediate version to 1.1
+
+2015-04-25  Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+	* synfig-core/configure.ac: Release version 1.0
+
+2015-04-24  Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+	* synfig-core/NEWS, synfig-core/configure.ac: Version 1.0 - RC5
+
+2015-04-21  [d.j.a.y] Jerome Blanchi <d.j.a.y at free.fr>
+
+	* synfig-core/po/POTFILES.in: Fix layer_sound localisation
+
+2015-04-18  Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+	* synfig-core/src/synfig/canvas.cpp: A better fix instead of
+	6151ec35a99 (Fix slashes when saving new file)
+
+2015-04-15  Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+	* synfig-core/NEWS, synfig-core/configure.ac: Version 1.0 - RC4
+
+2015-04-15  Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+	* synfig-core/po/ar.po, synfig-core/po/bs.po, synfig-core/po/ca.po,
+	synfig-core/po/cs.po, synfig-core/po/da.po, synfig-core/po/de.po,
+	synfig-core/po/el_GR.po, synfig-core/po/en_GB.po,
+	synfig-core/po/es.po, synfig-core/po/eu.po,
+	synfig-core/po/eu_ES.po, synfig-core/po/fa_IR.po,
+	synfig-core/po/fr.po, synfig-core/po/gl.po, synfig-core/po/he.po,
+	synfig-core/po/hu.po, synfig-core/po/it.po,
+	synfig-core/po/ja_JP.po, synfig-core/po/lt.po,
+	synfig-core/po/nl.po, synfig-core/po/no_NO.po,
+	synfig-core/po/pl_PL.po, synfig-core/po/pt_BR.po,
+	synfig-core/po/ro.po, synfig-core/po/ru.po, synfig-core/po/si.po,
+	synfig-core/po/sk_SK.po, synfig-core/po/sr_RS.po,
+	synfig-core/po/sv_SE.po, synfig-core/po/tr.po,
+	synfig-core/po/uz at Latn.po, synfig-core/po/zh-Hant.po,
+	synfig-core/po/zh_CN.po, synfig-core/po/zh_TW.po: Update
+	translations
+
+2015-04-15  Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+	* synfig-core/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp: Fix #833:
+	Can't render to avi if filename contains spaces
+
+2015-04-08  frijol <frijol at frijol.net>
+
+	* synfig-core/src/tool/main.cpp: Fix 843 : On Cli Error, print how
+	to invoke help
+
+2015-04-07  Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+	* synfig-core/src/synfig/layer_pastecanvas.cpp: Rename "Children
+	Lock" to "Lock Selection"
+
+2015-04-06  Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+	* synfig-core/po/ar.po, synfig-core/po/bs.po, synfig-core/po/ca.po,
+	synfig-core/po/cs.po, synfig-core/po/da.po, synfig-core/po/de.po,
+	synfig-core/po/el_GR.po, synfig-core/po/en_GB.po,
+	synfig-core/po/es.po, synfig-core/po/eu.po,
+	synfig-core/po/eu_ES.po, synfig-core/po/fa_IR.po,
+	synfig-core/po/fr.po, synfig-core/po/gl.po, synfig-core/po/he.po,
+	synfig-core/po/hu.po, synfig-core/po/it.po,
+	synfig-core/po/ja_JP.po, synfig-core/po/lt.po,
+	synfig-core/po/nl.po, synfig-core/po/no_NO.po,
+	synfig-core/po/pl_PL.po, synfig-core/po/pt_BR.po,
+	synfig-core/po/ro.po, synfig-core/po/ru.po, synfig-core/po/si.po,
+	synfig-core/po/sk_SK.po, synfig-core/po/sr_RS.po,
+	synfig-core/po/sv_SE.po, synfig-core/po/tr.po,
+	synfig-core/po/uz at Latn.po, synfig-core/po/zh-Hant.po,
+	synfig-core/po/zh_CN.po, synfig-core/po/zh_TW.po: Update
+	translations
+
+2015-04-06  Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+	* synfig-core/configure.ac: Bump API version
+
 2015-04-01  [d.j.a.y] Jerome Blanchi <d.j.a.y at free.fr>
 
 	* synfig-core/src/synfig/cairolistimporter.cpp,
diff --git a/Makefile.in b/Makefile.in
index 9b37fc9..370a256 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -18,7 +18,17 @@
 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -82,20 +92,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
-	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in $(srcdir)/synfig-config.in \
-	$(srcdir)/synfig.pc.in $(srcdir)/doxygen.cfg.in \
-	$(top_srcdir)/pkg-info/macosx/synfig-core.info.in ABOUT-NLS \
-	COPYING TODO config/compile config/config.guess \
-	config/config.rpath config/config.sub config/depcomp \
-	config/install-sh config/missing config/ltmain.sh \
-	$(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \
-	$(top_srcdir)/config/config.rpath \
-	$(top_srcdir)/config/config.sub \
-	$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
-	$(top_srcdir)/config/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -114,6 +110,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
@@ -208,6 +206,19 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+	$(srcdir)/doxygen.cfg.in $(srcdir)/synfig-config.in \
+	$(srcdir)/synfig.pc.in $(top_srcdir)/config/compile \
+	$(top_srcdir)/config/config.guess \
+	$(top_srcdir)/config/config.rpath \
+	$(top_srcdir)/config/config.sub \
+	$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
+	$(top_srcdir)/config/missing \
+	$(top_srcdir)/pkg-info/macosx/synfig-core.info.in ABOUT-NLS \
+	AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+	config/compile config/config.guess config/config.rpath \
+	config/config.sub config/depcomp config/install-sh \
+	config/ltmain.sh config/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -559,7 +570,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -854,15 +864,15 @@ dist-xz: distdir
 	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
-	@echo WARNING: "Support for shar distribution archives is" \
-	               "deprecated." >&2
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
 
 dist-shar: distdir
-	@echo WARNING: "Support for distribution archives compressed with" \
-		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
@@ -898,17 +908,17 @@ distcheck: dist
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	    --srcdir=.. --prefix="$$dc_install_base" \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -1088,6 +1098,8 @@ uninstall-am: uninstall-binSCRIPTS uninstall-pkgconfigDATA
 	tags tags-am uninstall uninstall-am uninstall-binSCRIPTS \
 	uninstall-pkgconfigDATA
 
+.PRECIOUS: Makefile
+
 
 stats:
 	- at echo
diff --git a/NEWS b/NEWS
index 8a79d27..501a93e 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,21 @@ More detailed notes are available on the news page:
 
 http://synfig.org/cms/en/news/
 
+ 1.0.2 (git tag "1.0.2") - October 9, 2015 - Bugfix release.
+ 
+  * "On" and "Off" parameters of a "Switch" convert now aren't linked by default (issue #766). Thanks to Max May.
+  * Allow to convert "Time" type to "Real". Thanks to Max May.
+  * Group Layer now have "Speed" parameter to adjust the playback of child layers. Thanks to Max May.
+  * New convert type: Reverse. Allows to reverse lists, strings, spline points, segments, gradients, width points and dash items. Thanks to Max May.
+  * The "Add" convert type now supports reverse manipulations for Real and Angle values.
+  * Forbid creating recursive (looped) connections for parameters (issue #48). Thanks to Jerome Blanchi.
+ 
+ 1.0.1 (git tag "1.0.1") - July 21, 2015 - Bugfix release.
+ 
+  * Fix reading alpha for images with indexed palette (bug #110).
+  * Fix crash if no fonts found.
+  * Internals: Reorganize layers and valuenodes into separate folders.
+
  1.0 (git tag "1.0") - April 27, 2015 - Major release.
  
   * Introduce new file format (SFG) which can store embed data.
diff --git a/README b/README
index f5fcfe0..62a49ac 100644
--- a/README
+++ b/README
@@ -43,6 +43,7 @@ Copyright 2011-2014 Diego Barrios
 Copyright 2012 Bertrand Greorie
 Copyright 2013-2015 Ivan Mahonin
 Copyright 2015 Denis Zdorovtsov
+Copyright 2015 Max May
 
 Licence
 
diff --git a/aclocal.m4 b/aclocal.m4
index f3b37de..e1ecd23 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 # configured tree to be moved without reconfiguration.
 
 AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 ])
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -573,7 +572,11 @@ to "yes", and re-run configure.
 END
     AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
   fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
 
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -602,7 +605,7 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -613,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -623,7 +626,7 @@ if test x"${install_sh}" != xset; then
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -645,7 +648,7 @@ AC_SUBST([am__leading_dot])])
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -680,7 +683,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -730,7 +733,7 @@ rm -f confinc confmf
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -767,7 +770,7 @@ else
 fi
 ])
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -801,7 +804,7 @@ esac
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -830,7 +833,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -877,7 +880,7 @@ AC_LANG_POP([C])])
 # For backward compatibility.
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -896,7 +899,7 @@ AC_DEFUN([AM_RUN_LOG],
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -977,7 +980,7 @@ AC_CONFIG_COMMANDS_PRE(
 rm -f conftest.file
 ])
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1037,7 +1040,7 @@ AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1065,7 +1068,7 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1084,7 +1087,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/build_tools/Makefile.in b/build_tools/Makefile.in
index 4713155..1dd3615 100644
--- a/build_tools/Makefile.in
+++ b/build_tools/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -79,8 +89,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = build_tools
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(dist_noinst_SCRIPTS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -99,6 +107,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(dist_noinst_SCRIPTS) \
+	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -124,6 +134,7 @@ am__can_run_installinfo = \
     *) (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)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -347,7 +358,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu build_tools/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu build_tools/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -523,6 +533,8 @@ uninstall-am:
 	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
 	uninstall-am
 
+.PRECIOUS: Makefile
+
 
 all-local:
 	sh $(srcdir)/autorevision.sh "$(top_srcdir)" "$(top_builddir)"
diff --git a/config/compile b/config/compile
index 531136b..a85b723 100755
--- a/config/compile
+++ b/config/compile
@@ -3,7 +3,7 @@
 
 scriptversion=2012-10-14.11; # UTC
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey at cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/config/config.guess b/config/config.guess
index 1f5c50c..dbfb978 100755
--- a/config/config.guess
+++ b/config/config.guess
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
+#   Copyright 1992-2015 Free Software Foundation, Inc.
 
-timestamp='2014-03-23'
+timestamp='2015-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -24,12 +24,12 @@ timestamp='2014-03-23'
 # program.  This Exception is an additional permission under section 7
 # of the GNU General Public License, version 3 ("GPLv3").
 #
-# Originally written by Per Bothner.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 #
-# Please send patches with a ChangeLog entry to config-patches at gnu.org.
+# Please send patches to <config-patches at gnu.org>.
 
 
 me=`echo "$0" | sed -e 's,.*/,,'`
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -579,8 +579,9 @@ EOF
 	else
 		IBM_ARCH=powerpc
 	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
+	if [ -x /usr/bin/lslpp ] ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
 	else
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
diff --git a/config/config.sub b/config/config.sub
index 66c5074..6467c95 100755
--- a/config/config.sub
+++ b/config/config.sub
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
+#   Copyright 1992-2015 Free Software Foundation, Inc.
 
-timestamp='2014-07-28'
+timestamp='2015-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ timestamp='2014-07-28'
 # of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches with a ChangeLog entry to config-patches at gnu.org.
+# Please send patches to <config-patches at gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -68,7 +68,7 @@ Report bugs and patches to <config-patches at gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -260,7 +260,7 @@ case $basic_machine in
 	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| epiphany \
-	| fido | fr30 | frv \
+	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
@@ -302,6 +302,7 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
+	| riscv32 | riscv64 \
 	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
@@ -312,6 +313,7 @@ case $basic_machine in
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| visium \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -326,6 +328,9 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
+	leon|leon[3-9])
+		basic_machine=sparc-$basic_machine
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -436,6 +441,7 @@ case $basic_machine in
 	| ubicom32-* \
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
+	| visium-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -773,6 +779,9 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	leon-*|leon[3-9]-*)
+		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
diff --git a/config/depcomp b/config/depcomp
index 4ebd5b3..fc98710 100755
--- a/config/depcomp
+++ b/config/depcomp
@@ -3,7 +3,7 @@
 
 scriptversion=2013-05-30.07; # UTC
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/config/install-sh b/config/install-sh
index 377bb86..0b0fdcb 100755
--- a/config/install-sh
+++ b/config/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2011-11-20.07; # UTC
+scriptversion=2013-12-25.23; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC
 # This script is compatible with the BSD install script, but was written
 # from scratch.
 
+tab='	'
 nl='
 '
-IFS=" ""	$nl"
+IFS=" $tab$nl"
 
-# set DOITPROG to echo to test this script
+# Set DOITPROG to "echo" to test this script.
 
-# Don't use :- since 4.3BSD and earlier shells don't like it.
 doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
+doit_exec=${doit:-exec}
 
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
@@ -68,17 +64,6 @@ mvprog=${MVPROG-mv}
 rmprog=${RMPROG-rm}
 stripprog=${STRIPPROG-strip}
 
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
 posix_mkdir=
 
 # Desired mode of installed file.
@@ -97,7 +82,7 @@ dir_arg=
 dst_arg=
 
 copy_on_change=false
-no_target_directory=
+is_target_a_directory=possibly
 
 usage="\
 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@@ -137,46 +122,57 @@ while test $# -ne 0; do
     -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-	shift;;
+        shift;;
 
     --help) echo "$usage"; exit $?;;
 
     -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
+        case $mode in
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+            echo "$0: invalid mode: $mode" >&2
+            exit 1;;
+        esac
+        shift;;
 
     -o) chowncmd="$chownprog $2"
-	shift;;
+        shift;;
 
     -s) stripcmd=$stripprog;;
 
-    -t) dst_arg=$2
-	# Protect names problematic for 'test' and other utilities.
-	case $dst_arg in
-	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
-	esac
-	shift;;
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
+        # Protect names problematic for 'test' and other utilities.
+        case $dst_arg in
+          -* | [=\(\)!]) dst_arg=./$dst_arg;;
+        esac
+        shift;;
 
-    -T) no_target_directory=true;;
+    -T) is_target_a_directory=never;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    --)	shift
-	break;;
+    --) shift
+        break;;
 
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
+    -*) echo "$0: invalid option: $1" >&2
+        exit 1;;
 
     *)  break;;
   esac
   shift
 done
 
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
+
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
   # When -d is used, all remaining arguments are directories to create.
   # When -t is used, the destination is already specified.
@@ -208,6 +204,15 @@ if test $# -eq 0; then
 fi
 
 if test -z "$dir_arg"; then
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
+
+if test -z "$dir_arg"; then
   do_exit='(exit $ret); exit $ret'
   trap "ret=129; $do_exit" 1
   trap "ret=130; $do_exit" 2
@@ -223,16 +228,16 @@ if test -z "$dir_arg"; then
 
     *[0-7])
       if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
       else
-	u_plus_rw='% 200'
+        u_plus_rw='% 200'
       fi
       cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
     *)
       if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
       else
-	u_plus_rw=,u+rw
+        u_plus_rw=,u+rw
       fi
       cp_umask=$mode$u_plus_rw;;
   esac
@@ -269,41 +274,15 @@ do
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
+      if test "$is_target_a_directory" = never; then
+        echo "$0: $dst_arg: Is a directory" >&2
+        exit 1
       fi
       dstdir=$dst
       dst=$dstdir/`basename "$src"`
       dstdir_status=0
     else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
+      dstdir=`dirname "$dst"`
       test -d "$dstdir"
       dstdir_status=$?
     fi
@@ -314,74 +293,74 @@ do
   if test $dstdir_status != 0; then
     case $posix_mkdir in
       '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
+        # Create intermediate dirs using mode 755 as modified by the umask.
+        # This is like FreeBSD 'install' as of 1997-10-28.
+        umask=`umask`
+        case $stripcmd.$umask in
+          # Optimize common cases.
+          *[2367][2367]) mkdir_umask=$umask;;
+          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+          *[0-7])
+            mkdir_umask=`expr $umask + 22 \
+              - $umask % 100 % 40 + $umask % 20 \
+              - $umask % 10 % 4 + $umask % 2
+            `;;
+          *) mkdir_umask=$umask,go-w;;
+        esac
+
+        # With -d, create the new directory with the user-specified mode.
+        # Otherwise, rely on $mkdir_umask.
+        if test -n "$dir_arg"; then
+          mkdir_mode=-m$mode
+        else
+          mkdir_mode=
+        fi
+
+        posix_mkdir=false
+        case $umask in
+          *[123567][0-7][0-7])
+            # POSIX mkdir -p sets u+wx bits regardless of umask, which
+            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+            ;;
+          *)
+            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+            trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+            if (umask $mkdir_umask &&
+                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+            then
+              if test -z "$dir_arg" || {
+                   # Check for POSIX incompatibilities with -m.
+                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+                   # other-writable bit of parent directory when it shouldn't.
+                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+                   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+                   case $ls_ld_tmpdir in
+                     d????-?r-*) different_mode=700;;
+                     d????-?--*) different_mode=755;;
+                     *) false;;
+                   esac &&
+                   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+                     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+                   }
+                 }
+              then posix_mkdir=:
+              fi
+              rmdir "$tmpdir/d" "$tmpdir"
+            else
+              # Remove any dirs left behind by ancient mkdir implementations.
+              rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+            fi
+            trap '' 0;;
+        esac;;
     esac
 
     if
       $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+        umask $mkdir_umask &&
+        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
       )
     then :
     else
@@ -391,53 +370,51 @@ do
       # directory the slow way, step by step, checking for races as we go.
 
       case $dstdir in
-	/*) prefix='/';;
-	[-=\(\)!]*) prefix='./';;
-	*)  prefix='';;
+        /*) prefix='/';;
+        [-=\(\)!]*) prefix='./';;
+        *)  prefix='';;
       esac
 
-      eval "$initialize_posix_glob"
-
       oIFS=$IFS
       IFS=/
-      $posix_glob set -f
+      set -f
       set fnord $dstdir
       shift
-      $posix_glob set +f
+      set +f
       IFS=$oIFS
 
       prefixes=
 
       for d
       do
-	test X"$d" = X && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
+        test X"$d" = X && continue
+
+        prefix=$prefix$d
+        if test -d "$prefix"; then
+          prefixes=
+        else
+          if $posix_mkdir; then
+            (umask=$mkdir_umask &&
+             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+            # Don't fail if two instances are running concurrently.
+            test -d "$prefix" || exit 1
+          else
+            case $prefix in
+              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+              *) qprefix=$prefix;;
+            esac
+            prefixes="$prefixes '$qprefix'"
+          fi
+        fi
+        prefix=$prefix/
       done
 
       if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
+        # Don't fail if two instances are running concurrently.
+        (umask $mkdir_umask &&
+         eval "\$doit_exec \$mkdirprog $prefixes") ||
+          test -d "$dstdir" || exit 1
+        obsolete_mkdir_used=true
       fi
     fi
   fi
@@ -472,15 +449,12 @@ do
 
     # If -C, don't bother to copy if it wouldn't change the file.
     if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
+       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+       set -f &&
        set X $old && old=:$2:$4:$5:$6 &&
        set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
+       set +f &&
        test "$old" = "$new" &&
        $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
     then
@@ -493,24 +467,24 @@ do
       # to itself, or perhaps because mv is so ancient that it does not
       # support -f.
       {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
+        # Now remove or move aside any old file at destination location.
+        # We try this two ways since rm can't unlink itself on some
+        # systems and the destination file might be busy for other
+        # reasons.  In this case, the final cleanup might fail but the new
+        # file should still install successfully.
+        {
+          test ! -f "$dst" ||
+          $doit $rmcmd -f "$dst" 2>/dev/null ||
+          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+          } ||
+          { echo "$0: cannot unlink or rename $dst" >&2
+            (exit 1); exit 1
+          }
+        } &&
+
+        # Now rename the file to the real destination.
+        $doit $mvcmd "$dsttmp" "$dst"
       }
     fi || exit 1
 
diff --git a/config/missing b/config/missing
index db98974..f62bbae 100755
--- a/config/missing
+++ b/config/missing
@@ -3,7 +3,7 @@
 
 scriptversion=2013-10-28.13; # UTC
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
diff --git a/config/test-driver b/config/test-driver
index d306056..8e575b0 100755
--- a/config/test-driver
+++ b/config/test-driver
@@ -3,7 +3,7 @@
 
 scriptversion=2013-07-13.22; # UTC
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -106,11 +106,14 @@ trap "st=143; $do_exit" 15
 # Test script is run here.
 "$@" >$log_file 2>&1
 estatus=$?
+
 if test $enable_hard_errors = no && test $estatus -eq 99; then
-  estatus=1
+  tweaked_estatus=1
+else
+  tweaked_estatus=$estatus
 fi
 
-case $estatus:$expect_failure in
+case $tweaked_estatus:$expect_failure in
   0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
   0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
   77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
@@ -119,6 +122,12 @@ case $estatus:$expect_failure in
   *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
 esac
 
+# Report the test outcome and exit status in the logs, so that one can
+# know whether the test passed or failed simply by looking at the '.log'
+# file, without the need of also peaking into the corresponding '.trs'
+# file (automake bug#11814).
+echo "$res $test_name (exit status: $estatus)" >>$log_file
+
 # Report outcome to console.
 echo "${col}${res}${std}: $test_name"
 
diff --git a/configure b/configure
index bab78f2..2fa9c04 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Synfig Core 1.0-RC5.
+# Generated by GNU Autoconf 2.69 for Synfig Core 1.0.2.
 #
 # Report bugs to <http://www.synfig.org/issues/thebuggenie/synfig>.
 #
@@ -595,8 +595,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Synfig Core'
 PACKAGE_TARNAME='synfig'
-PACKAGE_VERSION='1.0-RC5'
-PACKAGE_STRING='Synfig Core 1.0-RC5'
+PACKAGE_VERSION='1.0.2'
+PACKAGE_STRING='Synfig Core 1.0.2'
 PACKAGE_BUGREPORT='http://www.synfig.org/issues/thebuggenie/synfig'
 PACKAGE_URL=''
 
@@ -893,8 +893,8 @@ enable_option_checking
 enable_silent_rules
 enable_maintainer_mode
 enable_dependency_tracking
-enable_debug
 enable_optimization
+enable_debug
 enable_warnings
 enable_profiling
 enable_profile_arcs
@@ -1488,7 +1488,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Synfig Core 1.0-RC5 to adapt to many kinds of systems.
+\`configure' configures Synfig Core 1.0.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1558,7 +1558,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Synfig Core 1.0-RC5:";;
+     short | recursive ) echo "Configuration of Synfig Core 1.0.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1575,8 +1575,8 @@ Optional Features:
                           do not reject slow dependency extractors
   --disable-dependency-tracking
                           speeds up one-time build
-  --enable-debug           Build in debugging mode
   --enable-optimization=[0,1,2,3,4] Select optimization level (default=2)
+  --enable-debug           Build in debugging mode
   --enable-warnings=[none|minimum|maximum|hardcore]
                           Control compiler pickyness.  [default=maximum]
   --enable-profiling      Enable profiling using gprof
@@ -1729,7 +1729,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Synfig Core configure 1.0-RC5
+Synfig Core configure 1.0.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2596,7 +2596,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Synfig Core $as_me 1.0-RC5, which was
+It was created by Synfig Core $as_me 1.0.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3049,7 +3049,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
 
-am__api_version='1.14'
+am__api_version='1.15'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -3221,8 +3221,8 @@ test "$program_suffix" != NONE &&
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 if test x"${MISSING+set}" != xset; then
   case $am_aux_dir in
@@ -3241,7 +3241,7 @@ else
 $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -3535,7 +3535,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='synfig'
- VERSION='1.0-RC5'
+ VERSION='1.0.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3569,8 +3569,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'
 
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 # Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
@@ -3628,6 +3628,7 @@ END
   fi
 fi
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
     # Check whether --enable-maintainer-mode was given.
@@ -6087,43 +6088,6 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 # -- A R G U M E N T S ----------------------------------------
 
 
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for debug flags" >&5
-$as_echo_n "checking for debug flags... " >&6; }
-
-	# Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then :
-  enableval=$enable_debug;
-		debug=$enableval
-
-else
-
-		debug="no"
-
-fi
-
-	debug_flags=''
-
-	case "$debug" in
-		yes)
-			debug_flags="-D_DEBUG -g"
-		;;
-		half)
-			debug_flags="-DNDEBUG -g"
-		;;
-		no|*)
-			debug_flags="-DNDEBUG"
-		;;
-	esac
-
-
-	CXXFLAGS="`echo $CXXFLAGS | sed s:-g::` $debug_flags"
-	CFLAGS="`echo $CFLAGS | sed s:-g::` $debug_flags"
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $debug_flags" >&5
-$as_echo "$debug_flags" >&6; }
-
-
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for optimization flags" >&5
 $as_echo_n "checking for optimization flags... " >&6; }
 
@@ -6154,6 +6118,39 @@ fi
 $as_echo "$optimization_flags" >&6; }
 
 
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for debug flags" >&5
+$as_echo_n "checking for debug flags... " >&6; }
+
+	# Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then :
+  enableval=$enable_debug;
+		debug=$enableval
+
+else
+
+		debug="no"
+
+fi
+
+	debug_flags=''
+
+	case "$debug" in
+		yes)
+			debug_flags="-D_DEBUG -g -O0"
+			CXXFLAGS="`echo $CXXFLAGS | sed s:-O.::` $debug_flags -fno-inline"
+			CFLAGS="`echo $CFLAGS | sed s:-O.::` $debug_flags"
+		;;
+		no|*)
+			debug_flags="-DNDEBUG"
+			CXXFLAGS="`echo $CXXFLAGS | sed 's:-g[a-z-]*\s::g' | sed 's:-g[a-z-]*$::'` $debug_flags"
+			CFLAGS="`echo $CFLAGS | sed 's:-g[a-z-]*\s::g' | sed 's:-g[a-z-]*$::'` $debug_flags"
+		;;
+	esac
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $debug_flags" >&5
+$as_echo "$debug_flags" >&6; }
+
+
   # Check whether --enable-warnings was given.
 if test "${enable_warnings+set}" = set; then :
   enableval=$enable_warnings; gtkmm_enable_warnings="$enableval"
@@ -17287,6 +17284,7 @@ else
   HAVE_LIBMAGICKPP_FALSE=
 fi
 
+		CONFIG_DEPS="$CONFIG_DEPS Magick++"
 
   else
 
@@ -17669,6 +17667,7 @@ $as_echo "$LIBSWSCALE_LIBS" >&6; }
 
 $as_echo "#define WITH_LIBSWSCALE /**/" >>confdefs.h
 
+		CONFIG_DEPS="$CONFIG_DEPS libswscale"
 
 		# Need to check both the new and old locations for the swscale header
 		# Need to save flags, add swscale flags, check headers and restore flags
@@ -17860,6 +17859,7 @@ $as_echo "$FREETYPE_LIBS" >&6; }
   if test $succeeded = yes; then
 
 		with_freetype="yes"
+		CONFIG_DEPS="$CONFIG_DEPS freetype2"
 
   else
 
@@ -18087,6 +18087,7 @@ $as_echo "$FONTCONFIG_LIBS" >&6; }
   if test $succeeded = yes; then
 
 		with_fontconfig="yes"
+		CONFIG_DEPS="$CONFIG_DEPS fontconfig"
 
   else
 
@@ -18237,6 +18238,7 @@ else
   WITH_OPENEXR_FALSE=
 fi
 
+		CONFIG_DEPS="$CONFIG_DEPS OpenEXR"
 
   else
 
@@ -18259,7 +18261,6 @@ fi
 if test $use_openexr_half = yes ; then {
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result:  ** Using OpenEXR Half." >&5
 $as_echo " ** Using OpenEXR Half." >&6; }
-	CONFIG_DEPS="$CONFIG_DEPS OpenEXR"
 	CONFIG_CFLAGS="$CONFIG_CFLAGS -DUSE_HALF_TYPE"
 	OPENEXR_HALF_LIBS="-lHalf"
 } else {
@@ -19374,7 +19375,7 @@ eval "LTDLOPEN=\"$libname_spec\""
 
 
 # Languages list (alphabetical order, please!)
-ALL_LINGUAS="ar bs ca cs da de el_GR en_GB es eu eu_ES fa_IR fr gl he hu it ja_JP lt nl no_NO pl_PL pt_BR ro ru si sk_SK sr_RS sv_SE tr uz at Latn zh-Hant zh_CN zh_TW"
+ALL_LINGUAS="ar bs ca cs cs_CZ da de el_GR en_CZ en_GB es eu eu_ES fa_IR fr gl he hu it ja_JP lt nl no_NO pl_PL pt_BR ro ru si sk_SK sr_RS sv_SE tr uz at Latn zh-Hant zh_CN zh_TW zh_TW.Big5 ur"
 
 
 mkdir_p="$MKDIR_P"
@@ -21095,23 +21096,23 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ETL >= 0.04.18-RC5" >&5
-$as_echo_n "checking for ETL >= 0.04.18-RC5... " >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ETL >= 0.04.19" >&5
+$as_echo_n "checking for ETL >= 0.04.19... " >&6; }
 
-        if $PKG_CONFIG --exists "ETL >= 0.04.18-RC5" ; then
+        if $PKG_CONFIG --exists "ETL >= 0.04.19" ; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking ETL_CFLAGS" >&5
 $as_echo_n "checking ETL_CFLAGS... " >&6; }
-            ETL_CFLAGS=`$PKG_CONFIG --cflags "ETL >= 0.04.18-RC5"`
+            ETL_CFLAGS=`$PKG_CONFIG --cflags "ETL >= 0.04.19"`
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ETL_CFLAGS" >&5
 $as_echo "$ETL_CFLAGS" >&6; }
 
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking ETL_LIBS" >&5
 $as_echo_n "checking ETL_LIBS... " >&6; }
-            ETL_LIBS=`$PKG_CONFIG --libs "ETL >= 0.04.18-RC5"`
+            ETL_LIBS=`$PKG_CONFIG --libs "ETL >= 0.04.19"`
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ETL_LIBS" >&5
 $as_echo "$ETL_LIBS" >&6; }
         else
@@ -21119,7 +21120,7 @@ $as_echo "$ETL_LIBS" >&6; }
             ETL_LIBS=""
             ## If we have a custom action on failure, don't print errors, but
             ## do set a variable so people can do so.
-            ETL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ETL >= 0.04.18-RC5"`
+            ETL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ETL >= 0.04.19"`
 
         fi
 
@@ -21135,7 +21136,7 @@ $as_echo "$ETL_LIBS" >&6; }
      :
   else
 
-	as_fn_error $? " ** You need to install the ETL (version 0.04.18-RC5 or greater)." "$LINENO" 5
+	as_fn_error $? " ** You need to install the ETL (version 0.04.19 or greater)." "$LINENO" 5
 
   fi
 
@@ -24871,7 +24872,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Synfig Core $as_me 1.0-RC5, which was
+This file was extended by Synfig Core $as_me 1.0.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -24937,7 +24938,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Synfig Core config.status 1.0-RC5
+Synfig Core config.status 1.0.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 3fede8c..cd28b51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,14 +2,14 @@
 
 # -- I N I T --------------------------------------------------
 
-AC_INIT([Synfig Core],[1.0-RC5],[http://www.synfig.org/issues/thebuggenie/synfig],[synfig])
+AC_INIT([Synfig Core],[1.0.2],[http://www.synfig.org/issues/thebuggenie/synfig],[synfig])
 AC_REVISION
 
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_HEADERS([config.h])
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE([nostdinc])
+AM_INIT_AUTOMAKE([nostdinc subdir-objects])
 AM_MAINTAINER_MODE
 
 AC_LIBLTDL_CONVENIENCE
@@ -46,9 +46,8 @@ AC_C_BIGENDIAN
 
 # -- A R G U M E N T S ----------------------------------------
 
-
-AC_ARG_DEBUG
 AC_ARG_OPTIMIZATION
+AC_ARG_DEBUG
 AC_ARG_WARNINGS
 AC_ARG_PROFILING
 AC_ARG_PROFILE_ARCS
@@ -133,6 +132,7 @@ if test $with_magickpp = "yes" ; then {
 	PKG_CHECK_MODULES(MAGICKPP, Magick++ >= 6.4.2,[
 		with_magickpp="yes"
 		AM_CONDITIONAL(HAVE_LIBMAGICKPP,true)
+		CONFIG_DEPS="$CONFIG_DEPS Magick++"
 	],[
 		with_magickpp="no"
 		AC_MSG_RESULT([ *** Magick++ Output target disabled])
@@ -223,6 +223,7 @@ if test $with_libavcodec = "yes" ; then {
 
 	if test $with_libswscale = "yes" ; then {
 		AC_DEFINE(WITH_LIBSWSCALE, [], [enable libswscale support])
+		CONFIG_DEPS="$CONFIG_DEPS libswscale"
 
 		# Need to check both the new and old locations for the swscale header
 		# Need to save flags, add swscale flags, check headers and restore flags
@@ -255,6 +256,7 @@ AC_ARG_WITH(freetype,
 if test $with_freetype != "no" ; then {
 	PKG_CHECK_MODULES(FREETYPE, freetype2,[
 		with_freetype="yes"
+		CONFIG_DEPS="$CONFIG_DEPS freetype2"
 	],[
 		PKG_CHECK_MODULES(FREETYPE, xft,[
 			with_freetype="yes"
@@ -277,6 +279,7 @@ AC_ARG_WITH(fontconfig,
 if test $with_fontconfig != "no" ; then {
 	PKG_CHECK_MODULES(FONTCONFIG, fontconfig,[
 		with_fontconfig="yes"
+		CONFIG_DEPS="$CONFIG_DEPS fontconfig"
 	],[
 		with_fontconfig="no"
 	])
@@ -300,6 +303,7 @@ if test $with_openexr = "yes" ; then {
 	PKG_CHECK_MODULES(OPENEXR, OpenEXR,[
 		AC_DEFINE(HAVE_OPENEXR,[], [ Define if OpenEXR is available ] )
 		AM_CONDITIONAL(WITH_OPENEXR,true)
+		CONFIG_DEPS="$CONFIG_DEPS OpenEXR"
 	],
 	[
 		with_openexr="no"
@@ -311,7 +315,6 @@ if test $with_openexr = "no" ; then {
 } ; fi
 if test $use_openexr_half = yes ; then {
 	AC_MSG_RESULT([ ** Using OpenEXR Half.])
-	CONFIG_DEPS="$CONFIG_DEPS OpenEXR"
 	CONFIG_CFLAGS="$CONFIG_CFLAGS -DUSE_HALF_TYPE"
 	OPENEXR_HALF_LIBS="-lHalf"
 } else {
@@ -336,15 +339,15 @@ AM_CONDITIONAL(WITH_JPEG, test $with_jpeg = yes)
 AC_LIB_LTDL
 
 # Languages list (alphabetical order, please!)
-ALL_LINGUAS="ar bs ca cs da de el_GR en_GB es eu eu_ES fa_IR fr gl he hu it ja_JP lt nl no_NO pl_PL pt_BR ro ru si sk_SK sr_RS sv_SE tr uz at Latn zh-Hant zh_CN zh_TW"
+ALL_LINGUAS="ar bs ca cs cs_CZ da de el_GR en_CZ en_GB es eu eu_ES fa_IR fr gl he hu it ja_JP lt nl no_NO pl_PL pt_BR ro ru si sk_SK sr_RS sv_SE tr uz at Latn zh-Hant zh_CN zh_TW zh_TW.Big5 ur"
 
 AM_GNU_GETTEXT([external])
 # This is here so autoreconf will run autopoint
 AM_GNU_GETTEXT_VERSION([0.15])
 localedir="$datadir/locale"
 
-PKG_CHECK_MODULES(ETL, [ETL >= 0.04.18-RC5],,[
-	AC_MSG_ERROR([ ** You need to install the ETL (version 0.04.18-RC5 or greater).])
+PKG_CHECK_MODULES(ETL, [ETL >= 0.04.19],,[
+	AC_MSG_ERROR([ ** You need to install the ETL (version 0.04.19 or greater).])
 ])
 CONFIG_DEPS="$CONFIG_DEPS ETL"
 
diff --git a/doxygen.cfg b/doxygen.cfg
index 7ad8b96..3324b73 100644
--- a/doxygen.cfg
+++ b/doxygen.cfg
@@ -23,7 +23,7 @@ PROJECT_NAME           = synfig
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.0-RC5
+PROJECT_NUMBER         = 1.0.2
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 514b760..7dda3fa 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -78,7 +88,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = examples
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -97,6 +106,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 =
@@ -156,6 +166,7 @@ am__define_uniq_tagged_files = \
 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`; \
@@ -440,7 +451,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu examples/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -736,6 +746,8 @@ uninstall-am:
 	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.
diff --git a/examples/walk/Makefile.in b/examples/walk/Makefile.in
index 820d35a..19a7a95 100644
--- a/examples/walk/Makefile.in
+++ b/examples/walk/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -78,7 +88,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = examples/walk
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -97,6 +106,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 =
@@ -121,6 +131,7 @@ am__can_run_installinfo = \
     *) (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)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -354,7 +365,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/walk/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu examples/walk/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -530,6 +540,8 @@ uninstall-am:
 	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.
diff --git a/m4/subs.m4 b/m4/subs.m4
index 69044bf..5247a85 100644
--- a/m4/subs.m4
+++ b/m4/subs.m4
@@ -77,20 +77,17 @@ AC_DEFUN([AC_ARG_DEBUG],
 
 	case "$debug" in
 		yes)
-			debug_flags="-D_DEBUG -g"
-		;;
-		half)
-			debug_flags="-DNDEBUG -g"
+			debug_flags="-D_DEBUG -g -O0"
+			CXXFLAGS="`echo $CXXFLAGS | sed s:-O.::` $debug_flags -fno-inline"
+			CFLAGS="`echo $CFLAGS | sed s:-O.::` $debug_flags"
 		;;
 		no|*)
 			debug_flags="-DNDEBUG"
+			CXXFLAGS="`echo $CXXFLAGS | sed 's:-g[[a-z-]]*\s::g' | sed 's:-g[[a-z-]]*$::'` $debug_flags"
+			CFLAGS="`echo $CFLAGS | sed 's:-g[[a-z-]]*\s::g' | sed 's:-g[[a-z-]]*$::'` $debug_flags"
 		;;
 	esac
 
-
-	CXXFLAGS="`echo $CXXFLAGS | sed s:-g::` $debug_flags"
-	CFLAGS="`echo $CFLAGS | sed s:-g::` $debug_flags"
-
 	AC_MSG_RESULT([$debug_flags])
 ])
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index bff8acd..0e15e10 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -197,7 +197,6 @@ src/synfig/cairolistimporter.h
 src/synfig/canvas.cpp
 src/synfig/canvas.h
 src/synfig/canvasbase.h
-src/synfig/color.cpp
 src/synfig/color.h
 src/synfig/context.cpp
 src/synfig/context.h
@@ -236,30 +235,32 @@ src/synfig/keyframe.cpp
 src/synfig/keyframe.h
 src/synfig/layer.cpp
 src/synfig/layer.h
-src/synfig/layer_bitmap.cpp
-src/synfig/layer_bitmap.h
-src/synfig/layer_composite.cpp
-src/synfig/layer_composite.h
-src/synfig/layer_duplicate.cpp
-src/synfig/layer_duplicate.h
-src/synfig/layer_mime.cpp
-src/synfig/layer_mime.h
-src/synfig/layer_motionblur.cpp
-src/synfig/layer_motionblur.h
-src/synfig/layer_pastecanvas.cpp
-src/synfig/layer_pastecanvas.h
-src/synfig/layer_polygon.cpp
-src/synfig/layer_polygon.h
-src/synfig/layer_shape.cpp
-src/synfig/layer_shape.h
-src/synfig/layer_skeleton.cpp
-src/synfig/layer_skeleton.h
-src/synfig/layer_solidcolor.cpp
-src/synfig/layer_solidcolor.h
-src/synfig/layer_sound.cpp
-src/synfig/layer_sound.h
-src/synfig/layer_switch.cpp
-src/synfig/layer_switch.h
+src/synfig/layers/layer_bitmap.cpp
+src/synfig/layers/layer_bitmap.h
+src/synfig/layers/layer_composite.cpp
+src/synfig/layers/layer_composite.h
+src/synfig/layers/layer_duplicate.cpp
+src/synfig/layers/layer_duplicate.h
+src/synfig/layers/layer_mime.cpp
+src/synfig/layers/layer_mime.h
+src/synfig/layers/layer_motionblur.cpp
+src/synfig/layers/layer_motionblur.h
+src/synfig/layers/layer_pastecanvas.cpp
+src/synfig/layers/layer_pastecanvas.h
+src/synfig/layers/layer_polygon.cpp
+src/synfig/layers/layer_polygon.h
+src/synfig/layers/layer_shape.cpp
+src/synfig/layers/layer_shape.h
+src/synfig/layers/layer_skeleton.cpp
+src/synfig/layers/layer_skeleton.h
+src/synfig/layers/layer_skeletondeformation.cpp
+src/synfig/layers/layer_skeletondeformation.h
+src/synfig/layers/layer_solidcolor.cpp
+src/synfig/layers/layer_solidcolor.h
+src/synfig/layers/layer_sound.cpp
+src/synfig/layers/layer_sound.h
+src/synfig/layers/layer_switch.cpp
+src/synfig/layers/layer_switch.h
 src/synfig/listimporter.cpp
 src/synfig/listimporter.h
 src/synfig/loadcanvas.cpp
@@ -329,132 +330,134 @@ src/synfig/value.cpp
 src/synfig/value.h
 src/synfig/valuenode.cpp
 src/synfig/valuenode.h
-src/synfig/valuenode_add.cpp
-src/synfig/valuenode_add.h
-src/synfig/valuenode_and.cpp
-src/synfig/valuenode_and.h
-src/synfig/valuenode_anglestring.cpp
-src/synfig/valuenode_anglestring.h
-src/synfig/valuenode_animated.cpp
-src/synfig/valuenode_animated.h
-src/synfig/valuenode_atan2.cpp
-src/synfig/valuenode_atan2.h
-src/synfig/valuenode_average.cpp
-src/synfig/valuenode_average.h
-src/synfig/valuenode_bline.cpp
-src/synfig/valuenode_bline.h
-src/synfig/valuenode_blinecalctangent.cpp
-src/synfig/valuenode_blinecalctangent.h
-src/synfig/valuenode_blinecalcvertex.cpp
-src/synfig/valuenode_blinecalcvertex.h
-src/synfig/valuenode_blinecalcwidth.cpp
-src/synfig/valuenode_blinecalcwidth.h
-src/synfig/valuenode_blinereversetangent.cpp
-src/synfig/valuenode_blinereversetangent.h
-src/synfig/valuenode_bone.cpp
-src/synfig/valuenode_bone.h
-src/synfig/valuenode_boneinfluence.cpp
-src/synfig/valuenode_boneinfluence.h
-src/synfig/valuenode_bonelink.cpp
-src/synfig/valuenode_bonelink.h
-src/synfig/valuenode_boneweightpair.cpp
-src/synfig/valuenode_boneweightpair.h
-src/synfig/valuenode_compare.cpp
-src/synfig/valuenode_compare.h
-src/synfig/valuenode_composite.cpp
-src/synfig/valuenode_composite.h
-src/synfig/valuenode_const.cpp
-src/synfig/valuenode_const.h
-src/synfig/valuenode_cos.cpp
-src/synfig/valuenode_cos.h
-src/synfig/valuenode_derivative.cpp
-src/synfig/valuenode_derivative.h
-src/synfig/valuenode_dilist.cpp
-src/synfig/valuenode_dilist.h
-src/synfig/valuenode_dotproduct.cpp
-src/synfig/valuenode_dotproduct.h
-src/synfig/valuenode_duplicate.cpp
-src/synfig/valuenode_duplicate.h
-src/synfig/valuenode_dynamic.cpp
-src/synfig/valuenode_dynamic.h
-src/synfig/valuenode_dynamiclist.cpp
-src/synfig/valuenode_dynamiclist.h
-src/synfig/valuenode_exp.cpp
-src/synfig/valuenode_exp.h
-src/synfig/valuenode_gradientcolor.cpp
-src/synfig/valuenode_gradientcolor.h
-src/synfig/valuenode_gradientrotate.cpp
-src/synfig/valuenode_gradientrotate.h
-src/synfig/valuenode_greyed.cpp
-src/synfig/valuenode_greyed.h
-src/synfig/valuenode_integer.cpp
-src/synfig/valuenode_integer.h
-src/synfig/valuenode_intstring.cpp
-src/synfig/valuenode_intstring.h
-src/synfig/valuenode_join.cpp
-src/synfig/valuenode_join.h
-src/synfig/valuenode_linear.cpp
-src/synfig/valuenode_linear.h
-src/synfig/valuenode_log.cpp
-src/synfig/valuenode_log.h
-src/synfig/valuenode_not.cpp
-src/synfig/valuenode_not.h
-src/synfig/valuenode_or.cpp
-src/synfig/valuenode_or.h
-src/synfig/valuenode_pow.cpp
-src/synfig/valuenode_pow.h
-src/synfig/valuenode_radialcomposite.cpp
-src/synfig/valuenode_radialcomposite.h
-src/synfig/valuenode_range.cpp
-src/synfig/valuenode_range.h
-src/synfig/valuenode_real.cpp
-src/synfig/valuenode_real.h
-src/synfig/valuenode_realstring.cpp
-src/synfig/valuenode_realstring.h
-src/synfig/valuenode_reciprocal.cpp
-src/synfig/valuenode_reciprocal.h
-src/synfig/valuenode_reference.cpp
-src/synfig/valuenode_reference.h
-src/synfig/valuenode_repeat_gradient.cpp
-src/synfig/valuenode_repeat_gradient.h
-src/synfig/valuenode_scale.cpp
-src/synfig/valuenode_scale.h
-src/synfig/valuenode_segcalctangent.cpp
-src/synfig/valuenode_segcalctangent.h
-src/synfig/valuenode_segcalcvertex.cpp
-src/synfig/valuenode_segcalcvertex.h
-src/synfig/valuenode_sine.cpp
-src/synfig/valuenode_sine.h
-src/synfig/valuenode_staticlist.cpp
-src/synfig/valuenode_staticlist.h
-src/synfig/valuenode_step.cpp
-src/synfig/valuenode_step.h
-src/synfig/valuenode_stripes.cpp
-src/synfig/valuenode_stripes.h
-src/synfig/valuenode_subtract.cpp
-src/synfig/valuenode_subtract.h
-src/synfig/valuenode_switch.cpp
-src/synfig/valuenode_switch.h
-src/synfig/valuenode_timedswap.cpp
-src/synfig/valuenode_timedswap.h
-src/synfig/valuenode_timeloop.cpp
-src/synfig/valuenode_timeloop.h
-src/synfig/valuenode_timestring.cpp
-src/synfig/valuenode_timestring.h
-src/synfig/valuenode_twotone.cpp
-src/synfig/valuenode_twotone.h
-src/synfig/valuenode_vectorangle.cpp
-src/synfig/valuenode_vectorangle.h
-src/synfig/valuenode_vectorlength.cpp
-src/synfig/valuenode_vectorlength.h
-src/synfig/valuenode_vectorx.cpp
-src/synfig/valuenode_vectorx.h
-src/synfig/valuenode_vectory.cpp
-src/synfig/valuenode_vectory.h
-src/synfig/valuenode_weightedaverage.cpp
-src/synfig/valuenode_weightedaverage.h
-src/synfig/valuenode_wplist.cpp
-src/synfig/valuenode_wplist.h
+src/synfig/valuenodes/valuenode_add.cpp
+src/synfig/valuenodes/valuenode_add.h
+src/synfig/valuenodes/valuenode_and.cpp
+src/synfig/valuenodes/valuenode_and.h
+src/synfig/valuenodes/valuenode_anglestring.cpp
+src/synfig/valuenodes/valuenode_anglestring.h
+src/synfig/valuenodes/valuenode_animated.cpp
+src/synfig/valuenodes/valuenode_animated.h
+src/synfig/valuenodes/valuenode_atan2.cpp
+src/synfig/valuenodes/valuenode_atan2.h
+src/synfig/valuenodes/valuenode_average.cpp
+src/synfig/valuenodes/valuenode_average.h
+src/synfig/valuenodes/valuenode_bline.cpp
+src/synfig/valuenodes/valuenode_bline.h
+src/synfig/valuenodes/valuenode_blinecalctangent.cpp
+src/synfig/valuenodes/valuenode_blinecalctangent.h
+src/synfig/valuenodes/valuenode_blinecalcvertex.cpp
+src/synfig/valuenodes/valuenode_blinecalcvertex.h
+src/synfig/valuenodes/valuenode_blinecalcwidth.cpp
+src/synfig/valuenodes/valuenode_blinecalcwidth.h
+src/synfig/valuenodes/valuenode_blinereversetangent.cpp
+src/synfig/valuenodes/valuenode_blinereversetangent.h
+src/synfig/valuenodes/valuenode_bone.cpp
+src/synfig/valuenodes/valuenode_bone.h
+src/synfig/valuenodes/valuenode_boneinfluence.cpp
+src/synfig/valuenodes/valuenode_boneinfluence.h
+src/synfig/valuenodes/valuenode_bonelink.cpp
+src/synfig/valuenodes/valuenode_bonelink.h
+src/synfig/valuenodes/valuenode_boneweightpair.cpp
+src/synfig/valuenodes/valuenode_boneweightpair.h
+src/synfig/valuenodes/valuenode_compare.cpp
+src/synfig/valuenodes/valuenode_compare.h
+src/synfig/valuenodes/valuenode_composite.cpp
+src/synfig/valuenodes/valuenode_composite.h
+src/synfig/valuenodes/valuenode_const.cpp
+src/synfig/valuenodes/valuenode_const.h
+src/synfig/valuenodes/valuenode_cos.cpp
+src/synfig/valuenodes/valuenode_cos.h
+src/synfig/valuenodes/valuenode_derivative.cpp
+src/synfig/valuenodes/valuenode_derivative.h
+src/synfig/valuenodes/valuenode_dilist.cpp
+src/synfig/valuenodes/valuenode_dilist.h
+src/synfig/valuenodes/valuenode_dotproduct.cpp
+src/synfig/valuenodes/valuenode_dotproduct.h
+src/synfig/valuenodes/valuenode_duplicate.cpp
+src/synfig/valuenodes/valuenode_duplicate.h
+src/synfig/valuenodes/valuenode_dynamic.cpp
+src/synfig/valuenodes/valuenode_dynamic.h
+src/synfig/valuenodes/valuenode_dynamiclist.cpp
+src/synfig/valuenodes/valuenode_dynamiclist.h
+src/synfig/valuenodes/valuenode_exp.cpp
+src/synfig/valuenodes/valuenode_exp.h
+src/synfig/valuenodes/valuenode_gradientcolor.cpp
+src/synfig/valuenodes/valuenode_gradientcolor.h
+src/synfig/valuenodes/valuenode_gradientrotate.cpp
+src/synfig/valuenodes/valuenode_gradientrotate.h
+src/synfig/valuenodes/valuenode_greyed.cpp
+src/synfig/valuenodes/valuenode_greyed.h
+src/synfig/valuenodes/valuenode_integer.cpp
+src/synfig/valuenodes/valuenode_integer.h
+src/synfig/valuenodes/valuenode_intstring.cpp
+src/synfig/valuenodes/valuenode_intstring.h
+src/synfig/valuenodes/valuenode_join.cpp
+src/synfig/valuenodes/valuenode_join.h
+src/synfig/valuenodes/valuenode_linear.cpp
+src/synfig/valuenodes/valuenode_linear.h
+src/synfig/valuenodes/valuenode_log.cpp
+src/synfig/valuenodes/valuenode_log.h
+src/synfig/valuenodes/valuenode_not.cpp
+src/synfig/valuenodes/valuenode_not.h
+src/synfig/valuenodes/valuenode_or.cpp
+src/synfig/valuenodes/valuenode_or.h
+src/synfig/valuenodes/valuenode_pow.cpp
+src/synfig/valuenodes/valuenode_pow.h
+src/synfig/valuenodes/valuenode_radialcomposite.cpp
+src/synfig/valuenodes/valuenode_radialcomposite.h
+src/synfig/valuenodes/valuenode_range.cpp
+src/synfig/valuenodes/valuenode_range.h
+src/synfig/valuenodes/valuenode_real.cpp
+src/synfig/valuenodes/valuenode_real.h
+src/synfig/valuenodes/valuenode_realstring.cpp
+src/synfig/valuenodes/valuenode_realstring.h
+src/synfig/valuenodes/valuenode_reciprocal.cpp
+src/synfig/valuenodes/valuenode_reciprocal.h
+src/synfig/valuenodes/valuenode_reference.cpp
+src/synfig/valuenodes/valuenode_reference.h
+src/synfig/valuenodes/valuenode_repeat_gradient.cpp
+src/synfig/valuenodes/valuenode_repeat_gradient.h
+src/synfig/valuenodes/valuenode_reverse.cpp
+src/synfig/valuenodes/valuenode_reverse.h
+src/synfig/valuenodes/valuenode_scale.cpp
+src/synfig/valuenodes/valuenode_scale.h
+src/synfig/valuenodes/valuenode_segcalctangent.cpp
+src/synfig/valuenodes/valuenode_segcalctangent.h
+src/synfig/valuenodes/valuenode_segcalcvertex.cpp
+src/synfig/valuenodes/valuenode_segcalcvertex.h
+src/synfig/valuenodes/valuenode_sine.cpp
+src/synfig/valuenodes/valuenode_sine.h
+src/synfig/valuenodes/valuenode_staticlist.cpp
+src/synfig/valuenodes/valuenode_staticlist.h
+src/synfig/valuenodes/valuenode_step.cpp
+src/synfig/valuenodes/valuenode_step.h
+src/synfig/valuenodes/valuenode_stripes.cpp
+src/synfig/valuenodes/valuenode_stripes.h
+src/synfig/valuenodes/valuenode_subtract.cpp
+src/synfig/valuenodes/valuenode_subtract.h
+src/synfig/valuenodes/valuenode_switch.cpp
+src/synfig/valuenodes/valuenode_switch.h
+src/synfig/valuenodes/valuenode_timedswap.cpp
+src/synfig/valuenodes/valuenode_timedswap.h
+src/synfig/valuenodes/valuenode_timeloop.cpp
+src/synfig/valuenodes/valuenode_timeloop.h
+src/synfig/valuenodes/valuenode_timestring.cpp
+src/synfig/valuenodes/valuenode_timestring.h
+src/synfig/valuenodes/valuenode_twotone.cpp
+src/synfig/valuenodes/valuenode_twotone.h
+src/synfig/valuenodes/valuenode_vectorangle.cpp
+src/synfig/valuenodes/valuenode_vectorangle.h
+src/synfig/valuenodes/valuenode_vectorlength.cpp
+src/synfig/valuenodes/valuenode_vectorlength.h
+src/synfig/valuenodes/valuenode_vectorx.cpp
+src/synfig/valuenodes/valuenode_vectorx.h
+src/synfig/valuenodes/valuenode_vectory.cpp
+src/synfig/valuenodes/valuenode_vectory.h
+src/synfig/valuenodes/valuenode_weightedaverage.cpp
+src/synfig/valuenodes/valuenode_weightedaverage.h
+src/synfig/valuenodes/valuenode_wplist.cpp
+src/synfig/valuenodes/valuenode_wplist.h
 src/synfig/valueoperations.cpp
 src/synfig/valueoperations.h
 src/synfig/valuetransformation.h
diff --git a/po/ar.gmo b/po/ar.gmo
index 9b5ce4a..4f05a45 100644
Binary files a/po/ar.gmo and b/po/ar.gmo differ
diff --git a/po/ar.po b/po/ar.po
index a0fa31f..49ec3da 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -5,10 +5,10 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/synfig/language/"
 "ar/)\n"
@@ -28,8 +28,9 @@ msgstr ""
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr ""
 
@@ -55,8 +56,9 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr ""
 
@@ -74,7 +76,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr ""
 
@@ -87,7 +89,7 @@ msgid "Italic"
 msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr ""
 
@@ -157,9 +159,12 @@ msgstr ""
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr ""
 
@@ -193,7 +198,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr ""
 
@@ -238,27 +243,27 @@ msgid "Type of blur to use"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr ""
 
@@ -345,6 +350,7 @@ msgstr ""
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr ""
 
@@ -355,13 +361,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr ""
 
@@ -419,7 +426,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr ""
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr ""
 
@@ -427,7 +434,8 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr ""
 
@@ -594,7 +602,8 @@ msgstr ""
 msgid "Scale Outside"
 msgstr ""
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr ""
 
@@ -611,12 +620,13 @@ msgstr ""
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr "المقدار"
 
@@ -638,7 +648,7 @@ msgid "Spherize"
 msgstr ""
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr ""
 
@@ -653,7 +663,7 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr ""
 
@@ -757,12 +767,13 @@ msgstr ""
 msgid "Avoid alpha artifacts when checked"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr ""
 
@@ -770,16 +781,19 @@ msgstr ""
 msgid "Start time of the loop for the cycled context"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr ""
 
@@ -803,7 +817,8 @@ msgstr ""
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr ""
 
@@ -912,11 +927,12 @@ msgstr ""
 msgid "Size of the pattern"
 msgstr ""
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr ""
 
@@ -1006,13 +1022,14 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr ""
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr ""
 
@@ -1024,6 +1041,7 @@ msgstr ""
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr ""
 
@@ -1063,9 +1081,9 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr ""
 
@@ -1129,7 +1147,7 @@ msgid "Blur"
 msgstr ""
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr ""
 
@@ -1157,7 +1175,8 @@ msgstr ""
 msgid "Exposure Adjust"
 msgstr ""
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr ""
 
@@ -1257,7 +1276,8 @@ msgstr ""
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr ""
 
@@ -1303,37 +1323,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr ""
 
@@ -1367,14 +1387,14 @@ msgid "Smoothness"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr ""
 
@@ -1442,7 +1462,8 @@ msgstr ""
 msgid "Radius of the circle"
 msgstr ""
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr ""
 
@@ -1465,8 +1486,9 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr ""
 
@@ -1485,7 +1507,7 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr ""
 
@@ -1565,9 +1587,11 @@ msgstr ""
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr ""
 
@@ -1653,10 +1677,10 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr ""
 
@@ -1799,32 +1823,32 @@ msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr ""
 
@@ -1882,13 +1906,20 @@ msgid "When checked the gradient is supersampled"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr ""
 
@@ -1910,6 +1941,7 @@ msgid "Seeds the random number generator"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr ""
 
@@ -1994,8 +2026,9 @@ msgid ""
 "size, and an alpha of 1.0 is used when rendering"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr ""
 
@@ -2003,8 +2036,9 @@ msgstr ""
 msgid "If enabled, render the plant in the opposite direction"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr ""
 
@@ -2215,7 +2249,7 @@ msgstr ""
 msgid "Importer::open(): Unknown file type -- "
 msgstr ""
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr ""
 
@@ -2227,251 +2261,292 @@ msgstr ""
 msgid "Modifies the position of the layer in the layer stack"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr ""
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+msgid "First corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+msgid "Second corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+msgid "Horizontal subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:51
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2767,7 +2842,7 @@ msgstr ""
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr ""
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr ""
 
@@ -2969,8 +3044,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr ""
 
@@ -3010,13 +3085,13 @@ msgstr ""
 msgid "Divide"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr ""
 
@@ -3032,12 +3107,14 @@ msgstr ""
 msgid "Darken"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr ""
 
@@ -3151,230 +3228,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr ""
 
@@ -3383,1319 +3490,1355 @@ msgstr ""
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+msgid "The value to be reversed"
+msgstr ""
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/bs.gmo b/po/bs.gmo
index bb03c1b..805d6e6 100644
Binary files a/po/bs.gmo and b/po/bs.gmo differ
diff --git a/po/bs.po b/po/bs.po
index 79dd9e2..b7c5406 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -5,10 +5,10 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/synfig/language/"
 "bs/)\n"
@@ -28,8 +28,9 @@ msgstr ""
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr ""
 
@@ -55,8 +56,9 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr ""
 
@@ -74,7 +76,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr ""
 
@@ -87,7 +89,7 @@ msgid "Italic"
 msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr ""
 
@@ -157,9 +159,12 @@ msgstr ""
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr ""
 
@@ -193,7 +198,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr ""
 
@@ -238,27 +243,27 @@ msgid "Type of blur to use"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr ""
 
@@ -345,6 +350,7 @@ msgstr ""
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr ""
 
@@ -355,13 +361,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr ""
 
@@ -419,7 +426,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr ""
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr ""
 
@@ -427,7 +434,8 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr ""
 
@@ -594,7 +602,8 @@ msgstr ""
 msgid "Scale Outside"
 msgstr ""
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr ""
 
@@ -611,12 +620,13 @@ msgstr ""
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr ""
 
@@ -638,7 +648,7 @@ msgid "Spherize"
 msgstr ""
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr ""
 
@@ -653,7 +663,7 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr ""
 
@@ -757,12 +767,13 @@ msgstr ""
 msgid "Avoid alpha artifacts when checked"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr ""
 
@@ -770,16 +781,19 @@ msgstr ""
 msgid "Start time of the loop for the cycled context"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr ""
 
@@ -803,7 +817,8 @@ msgstr ""
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr ""
 
@@ -912,11 +927,12 @@ msgstr ""
 msgid "Size of the pattern"
 msgstr ""
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr ""
 
@@ -1006,13 +1022,14 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr ""
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr ""
 
@@ -1024,6 +1041,7 @@ msgstr ""
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr ""
 
@@ -1063,9 +1081,9 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr ""
 
@@ -1129,7 +1147,7 @@ msgid "Blur"
 msgstr ""
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr ""
 
@@ -1157,7 +1175,8 @@ msgstr ""
 msgid "Exposure Adjust"
 msgstr ""
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr ""
 
@@ -1257,7 +1276,8 @@ msgstr ""
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr ""
 
@@ -1303,37 +1323,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr ""
 
@@ -1367,14 +1387,14 @@ msgid "Smoothness"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr ""
 
@@ -1442,7 +1462,8 @@ msgstr ""
 msgid "Radius of the circle"
 msgstr ""
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr ""
 
@@ -1465,8 +1486,9 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr ""
 
@@ -1485,7 +1507,7 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr ""
 
@@ -1565,9 +1587,11 @@ msgstr ""
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr ""
 
@@ -1653,10 +1677,10 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr ""
 
@@ -1799,32 +1823,32 @@ msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr ""
 
@@ -1882,13 +1906,20 @@ msgid "When checked the gradient is supersampled"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr ""
 
@@ -1910,6 +1941,7 @@ msgid "Seeds the random number generator"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr ""
 
@@ -1994,8 +2026,9 @@ msgid ""
 "size, and an alpha of 1.0 is used when rendering"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr ""
 
@@ -2003,8 +2036,9 @@ msgstr ""
 msgid "If enabled, render the plant in the opposite direction"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr ""
 
@@ -2215,7 +2249,7 @@ msgstr ""
 msgid "Importer::open(): Unknown file type -- "
 msgstr ""
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr ""
 
@@ -2227,251 +2261,292 @@ msgstr ""
 msgid "Modifies the position of the layer in the layer stack"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr ""
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+msgid "First corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+msgid "Second corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+msgid "Horizontal subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:51
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2767,7 +2842,7 @@ msgstr ""
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr ""
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr ""
 
@@ -2969,8 +3044,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr ""
 
@@ -3010,13 +3085,13 @@ msgstr ""
 msgid "Divide"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr ""
 
@@ -3032,12 +3107,14 @@ msgstr ""
 msgid "Darken"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr ""
 
@@ -3151,230 +3228,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr ""
 
@@ -3383,1319 +3490,1355 @@ msgstr ""
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+msgid "The value to be reversed"
+msgstr ""
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/ca.gmo b/po/ca.gmo
index d996e1a..88efe78 100644
Binary files a/po/ca.gmo and b/po/ca.gmo differ
diff --git a/po/ca.po b/po/ca.po
index b079963..37b9610 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -5,10 +5,10 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/synfig/language/"
 "ca/)\n"
@@ -27,8 +27,9 @@ msgstr ""
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "Un altre"
 
@@ -54,8 +55,9 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "Color"
 
@@ -73,7 +75,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr ""
 
@@ -86,7 +88,7 @@ msgid "Italic"
 msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr ""
 
@@ -156,9 +158,12 @@ msgstr ""
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr "Origen"
 
@@ -192,7 +197,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr "Inverteix"
 
@@ -237,27 +242,27 @@ msgid "Type of blur to use"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr ""
 
@@ -344,6 +349,7 @@ msgstr ""
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr ""
 
@@ -354,13 +360,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr ""
 
@@ -418,7 +425,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr ""
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr ""
 
@@ -426,7 +433,8 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr ""
 
@@ -593,7 +601,8 @@ msgstr ""
 msgid "Scale Outside"
 msgstr ""
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr ""
 
@@ -610,12 +619,13 @@ msgstr ""
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr "Quantitat"
 
@@ -637,7 +647,7 @@ msgid "Spherize"
 msgstr ""
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr ""
 
@@ -652,7 +662,7 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr "Ràdio"
 
@@ -756,12 +766,13 @@ msgstr ""
 msgid "Avoid alpha artifacts when checked"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr ""
 
@@ -769,16 +780,19 @@ msgstr ""
 msgid "Start time of the loop for the cycled context"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr ""
 
@@ -802,7 +816,8 @@ msgstr ""
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr ""
 
@@ -911,11 +926,12 @@ msgstr ""
 msgid "Size of the pattern"
 msgstr ""
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr ""
 
@@ -1005,13 +1021,14 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr ""
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr ""
 
@@ -1023,6 +1040,7 @@ msgstr ""
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr ""
 
@@ -1062,9 +1080,9 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr ""
 
@@ -1128,7 +1146,7 @@ msgid "Blur"
 msgstr ""
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr ""
 
@@ -1156,7 +1174,8 @@ msgstr ""
 msgid "Exposure Adjust"
 msgstr ""
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr ""
 
@@ -1256,7 +1275,8 @@ msgstr ""
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr ""
 
@@ -1302,37 +1322,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr ""
 
@@ -1366,14 +1386,14 @@ msgid "Smoothness"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr ""
 
@@ -1441,7 +1461,8 @@ msgstr ""
 msgid "Radius of the circle"
 msgstr ""
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr "Esvaïment"
 
@@ -1464,8 +1485,9 @@ msgstr "Determina la funció de caiguda de l'esvaïment"
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr "Lineal"
 
@@ -1484,7 +1506,7 @@ msgstr "Sigmoidea"
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr "Cossinus"
 
@@ -1564,9 +1586,11 @@ msgstr ""
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr "Angle"
 
@@ -1652,10 +1676,10 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr "Bucle"
 
@@ -1798,32 +1822,32 @@ msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr "Interpolació"
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr ""
 
@@ -1881,13 +1905,20 @@ msgid "When checked the gradient is supersampled"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr "Enllaça"
 
@@ -1909,6 +1940,7 @@ msgid "Seeds the random number generator"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr ""
 
@@ -1993,8 +2025,9 @@ msgid ""
 "size, and an alpha of 1.0 is used when rendering"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr ""
 
@@ -2002,8 +2035,9 @@ msgstr ""
 msgid "If enabled, render the plant in the opposite direction"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr ""
 
@@ -2214,7 +2248,7 @@ msgstr ""
 msgid "Importer::open(): Unknown file type -- "
 msgstr ""
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr ""
 
@@ -2226,252 +2260,292 @@ msgstr ""
 msgid "Modifies the position of the layer in the layer stack"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr "Mètode de barreja"
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr "Duplica"
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr "Índex"
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr ""
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr "Llenç"
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr "Nom"
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+msgid "First corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+msgid "Second corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+msgid "Horizontal subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:51
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
-msgstr "Ha estat impossible d'obrir el fitxer"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2767,7 +2841,7 @@ msgstr ""
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr ""
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr "Valor del node"
 
@@ -2969,8 +3043,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr ""
 
@@ -3010,13 +3084,13 @@ msgstr ""
 msgid "Divide"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr ""
 
@@ -3032,12 +3106,14 @@ msgstr ""
 msgid "Darken"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr "Matís"
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr "Saturació"
 
@@ -3151,230 +3227,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr "Sencer"
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr "Real"
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr ""
 
@@ -3383,1319 +3489,1355 @@ msgstr ""
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr "X"
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr "Roig"
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr "Verd"
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr "Blau"
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr "Transparència"
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr "Longitud"
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr "Valor"
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr "Luma"
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+msgid "The value to be reversed"
+msgstr ""
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr "Segment"
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr "Temps"
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr "Vector"
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/cs.gmo b/po/cs.gmo
index 9ae2381..d01dd7b 100644
Binary files a/po/cs.gmo and b/po/cs.gmo differ
diff --git a/po/cs.po b/po/cs.po
index 10b831d..cdb7c36 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,10 +7,10 @@
 # Jiří Vírava <appukonrad at gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/synfig/language/"
 "cs/)\n"
@@ -29,8 +29,9 @@ msgstr "Text"
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "Ostatní"
 
@@ -56,8 +57,9 @@ msgstr "Text k rendrování"
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "Barva"
 
@@ -75,7 +77,7 @@ msgstr "Styl"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr "Normální"
 
@@ -88,7 +90,7 @@ msgid "Italic"
 msgstr "Kurzíva"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr "Zatížení"
 
@@ -158,9 +160,12 @@ msgstr "Orientace textu"
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr "Počátek"
 
@@ -194,7 +199,7 @@ msgstr "Tuto funkci vypnout, pokud se bude používat animace textu"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr "Převrátit"
 
@@ -239,27 +244,27 @@ msgid "Type of blur to use"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr ""
 
@@ -346,6 +351,7 @@ msgstr ""
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr "Zkreslení"
 
@@ -356,13 +362,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr "Šířka"
 
@@ -420,7 +427,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr ""
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr ""
 
@@ -428,7 +435,8 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr ""
 
@@ -595,7 +603,8 @@ msgstr ""
 msgid "Scale Outside"
 msgstr ""
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr ""
 
@@ -612,12 +621,13 @@ msgstr ""
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr "Množství"
 
@@ -639,7 +649,7 @@ msgid "Spherize"
 msgstr ""
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr ""
 
@@ -654,7 +664,7 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr "Rádius"
 
@@ -758,12 +768,13 @@ msgstr ""
 msgid "Avoid alpha artifacts when checked"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr ""
 
@@ -771,16 +782,19 @@ msgstr ""
 msgid "Start time of the loop for the cycled context"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr ""
 
@@ -804,7 +818,8 @@ msgstr ""
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr ""
 
@@ -913,11 +928,12 @@ msgstr ""
 msgid "Size of the pattern"
 msgstr ""
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr ""
 
@@ -1007,13 +1023,14 @@ msgstr "Příklad"
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr "Vyplň barvu vrstvy"
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr "Bod 1"
 
@@ -1025,6 +1042,7 @@ msgstr "První roh obdélníku"
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr "Bod 2"
 
@@ -1064,9 +1082,9 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr "Gradient"
 
@@ -1130,7 +1148,7 @@ msgid "Blur"
 msgstr ""
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr ""
 
@@ -1158,7 +1176,8 @@ msgstr ""
 msgid "Exposure Adjust"
 msgstr ""
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr ""
 
@@ -1258,7 +1277,8 @@ msgstr ""
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr ""
 
@@ -1304,37 +1324,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr ""
 
@@ -1368,14 +1388,14 @@ msgid "Smoothness"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr ""
 
@@ -1443,7 +1463,8 @@ msgstr ""
 msgid "Radius of the circle"
 msgstr ""
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr ""
 
@@ -1466,8 +1487,9 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr "Lineární"
 
@@ -1486,7 +1508,7 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr "Kosinus"
 
@@ -1566,9 +1588,11 @@ msgstr ""
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr "Úhel"
 
@@ -1654,10 +1678,10 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr ""
 
@@ -1800,32 +1824,32 @@ msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr "Interpolace"
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr ""
 
@@ -1883,13 +1907,20 @@ msgid "When checked the gradient is supersampled"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr ""
 
@@ -1911,6 +1942,7 @@ msgid "Seeds the random number generator"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr ""
 
@@ -1995,8 +2027,9 @@ msgid ""
 "size, and an alpha of 1.0 is used when rendering"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr ""
 
@@ -2004,8 +2037,9 @@ msgstr ""
 msgid "If enabled, render the plant in the opposite direction"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr ""
 
@@ -2216,7 +2250,7 @@ msgstr ""
 msgid "Importer::open(): Unknown file type -- "
 msgstr ""
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr ""
 
@@ -2228,252 +2262,295 @@ msgstr ""
 msgid "Modifies the position of the layer in the layer stack"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr "Duplikovat"
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr ""
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr "Plátno"
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr "Název"
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+#, fuzzy
+msgid "First corner of the bounds rectangle"
+msgstr "První roh obdélníku"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+#, fuzzy
+msgid "Second corner of the bounds rectangle"
+msgstr "Druhý roh obdélníku"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+#, fuzzy
+msgid "Horizontal subdivisions"
+msgstr "Vodorovné mezery"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:51
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
-msgstr "Není možné otevřít soubor"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2769,7 +2846,7 @@ msgstr ""
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr ""
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr ""
 
@@ -2971,8 +3048,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr ""
 
@@ -3012,13 +3089,13 @@ msgstr ""
 msgid "Divide"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr ""
 
@@ -3034,12 +3111,14 @@ msgstr ""
 msgid "Darken"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr "Odstín"
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr "Saturace"
 
@@ -3153,230 +3232,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr "Úhel vektoru"
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr "Délka vektoru"
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr "Vektor X"
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr "Vektor Y"
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr ""
 
@@ -3385,1319 +3494,1355 @@ msgstr ""
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr "X"
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr "Červená"
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr "Zelená"
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr "Modrá"
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr "Alfa"
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr "Vrchol 1"
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr "První vrchol segmentu"
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr "Tečna 1"
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr "První tečna segmentu"
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr "Vrchol 2"
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr "Druhý vrchol segmentu"
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr "Tečna 2"
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr "Druhá tečna segmentu"
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr "Osa X"
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr "Osa Y"
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr "Vrchol"
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr "Interpolace"
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr "Horní hranice"
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr "Hodnota"
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+msgid "The value to be reversed"
+msgstr ""
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr "Segment"
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr "Barva 1"
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr "Barva 2"
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr "Čas"
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr "Vektor"
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/cs_CZ.gmo b/po/cs_CZ.gmo
new file mode 100644
index 0000000..8148fff
Binary files /dev/null and b/po/cs_CZ.gmo differ
diff --git a/po/bs.po b/po/cs_CZ.po
similarity index 71%
copy from po/bs.po
copy to po/cs_CZ.po
index 79dd9e2..3d0b841 100644
--- a/po/bs.po
+++ b/po/cs_CZ.po
@@ -5,19 +5,18 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
-"Language-Team: Bosnian (http://www.transifex.com/projects/p/synfig/language/"
-"bs/)\n"
-"Language: bs\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/"
+"synfig/language/cs_CZ/)\n"
+"Language: cs_CZ\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:66
 #: src/modules/lyr_freetype/lyr_freetype.cpp:569
@@ -28,8 +27,9 @@ msgstr ""
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr ""
 
@@ -55,8 +55,9 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr ""
 
@@ -74,7 +75,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr ""
 
@@ -87,7 +88,7 @@ msgid "Italic"
 msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr ""
 
@@ -157,9 +158,12 @@ msgstr ""
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr ""
 
@@ -193,7 +197,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr ""
 
@@ -238,27 +242,27 @@ msgid "Type of blur to use"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr ""
 
@@ -345,6 +349,7 @@ msgstr ""
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr ""
 
@@ -355,13 +360,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr ""
 
@@ -419,7 +425,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr ""
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr ""
 
@@ -427,7 +433,8 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr ""
 
@@ -594,7 +601,8 @@ msgstr ""
 msgid "Scale Outside"
 msgstr ""
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr ""
 
@@ -611,12 +619,13 @@ msgstr ""
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr ""
 
@@ -638,7 +647,7 @@ msgid "Spherize"
 msgstr ""
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr ""
 
@@ -653,7 +662,7 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr ""
 
@@ -757,12 +766,13 @@ msgstr ""
 msgid "Avoid alpha artifacts when checked"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr ""
 
@@ -770,16 +780,19 @@ msgstr ""
 msgid "Start time of the loop for the cycled context"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr ""
 
@@ -803,7 +816,8 @@ msgstr ""
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr ""
 
@@ -912,11 +926,12 @@ msgstr ""
 msgid "Size of the pattern"
 msgstr ""
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr ""
 
@@ -1006,13 +1021,14 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr ""
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr ""
 
@@ -1024,6 +1040,7 @@ msgstr ""
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr ""
 
@@ -1063,9 +1080,9 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr ""
 
@@ -1129,7 +1146,7 @@ msgid "Blur"
 msgstr ""
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr ""
 
@@ -1157,7 +1174,8 @@ msgstr ""
 msgid "Exposure Adjust"
 msgstr ""
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr ""
 
@@ -1257,7 +1275,8 @@ msgstr ""
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr ""
 
@@ -1303,37 +1322,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr ""
 
@@ -1367,14 +1386,14 @@ msgid "Smoothness"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr ""
 
@@ -1442,7 +1461,8 @@ msgstr ""
 msgid "Radius of the circle"
 msgstr ""
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr ""
 
@@ -1465,8 +1485,9 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr ""
 
@@ -1485,7 +1506,7 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr ""
 
@@ -1565,9 +1586,11 @@ msgstr ""
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr ""
 
@@ -1653,10 +1676,10 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr ""
 
@@ -1799,32 +1822,32 @@ msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr ""
 
@@ -1882,13 +1905,20 @@ msgid "When checked the gradient is supersampled"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr ""
 
@@ -1910,6 +1940,7 @@ msgid "Seeds the random number generator"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr ""
 
@@ -1994,8 +2025,9 @@ msgid ""
 "size, and an alpha of 1.0 is used when rendering"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr ""
 
@@ -2003,8 +2035,9 @@ msgstr ""
 msgid "If enabled, render the plant in the opposite direction"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr ""
 
@@ -2215,7 +2248,7 @@ msgstr ""
 msgid "Importer::open(): Unknown file type -- "
 msgstr ""
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr ""
 
@@ -2227,251 +2260,292 @@ msgstr ""
 msgid "Modifies the position of the layer in the layer stack"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr ""
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+msgid "First corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+msgid "Second corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+msgid "Horizontal subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:51
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2767,7 +2841,7 @@ msgstr ""
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr ""
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr ""
 
@@ -2969,8 +3043,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr ""
 
@@ -3010,13 +3084,13 @@ msgstr ""
 msgid "Divide"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr ""
 
@@ -3032,12 +3106,14 @@ msgstr ""
 msgid "Darken"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr ""
 
@@ -3151,230 +3227,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr ""
 
@@ -3383,1319 +3489,1355 @@ msgstr ""
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+msgid "The value to be reversed"
+msgstr ""
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/da.gmo b/po/da.gmo
index 0539021..220d467 100644
Binary files a/po/da.gmo and b/po/da.gmo differ
diff --git a/po/da.po b/po/da.po
index a726ed8..b4c1eb4 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,10 +6,10 @@
 # Joe Hansen <joedalton2 at yahoo.dk>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/synfig/language/"
 "da/)\n"
@@ -28,8 +28,9 @@ msgstr "Tekst"
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "Andre"
 
@@ -55,8 +56,9 @@ msgstr "Tekst at optegne"
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "Farve"
 
@@ -74,7 +76,7 @@ msgstr "Stil"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr "Normal"
 
@@ -87,7 +89,7 @@ msgid "Italic"
 msgstr "Kursiv"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr ""
 
@@ -157,9 +159,12 @@ msgstr "Tekstretning"
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr ""
 
@@ -193,7 +198,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr ""
 
@@ -238,27 +243,27 @@ msgid "Type of blur to use"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr ""
 
@@ -345,6 +350,7 @@ msgstr ""
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr ""
 
@@ -355,13 +361,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr ""
 
@@ -419,7 +426,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr "Filnavn er allerede sat til »%s« (%s)"
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr "Filnavn"
 
@@ -427,7 +434,8 @@ msgstr "Filnavn"
 msgid "File to import"
 msgstr "Fil at importere"
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr "Tidsforskydning"
 
@@ -594,7 +602,8 @@ msgstr ""
 msgid "Scale Outside"
 msgstr ""
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr ""
 
@@ -611,12 +620,13 @@ msgstr ""
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr "Antal"
 
@@ -638,7 +648,7 @@ msgid "Spherize"
 msgstr ""
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr ""
 
@@ -653,7 +663,7 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr ""
 
@@ -757,12 +767,13 @@ msgstr ""
 msgid "Avoid alpha artifacts when checked"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr ""
 
@@ -770,16 +781,19 @@ msgstr ""
 msgid "Start time of the loop for the cycled context"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr ""
 
@@ -803,7 +817,8 @@ msgstr ""
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr ""
 
@@ -912,11 +927,12 @@ msgstr ""
 msgid "Size of the pattern"
 msgstr ""
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr ""
 
@@ -1006,13 +1022,14 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr ""
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr ""
 
@@ -1024,6 +1041,7 @@ msgstr ""
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr ""
 
@@ -1063,9 +1081,9 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr ""
 
@@ -1129,7 +1147,7 @@ msgid "Blur"
 msgstr ""
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr ""
 
@@ -1157,7 +1175,8 @@ msgstr ""
 msgid "Exposure Adjust"
 msgstr ""
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr ""
 
@@ -1257,7 +1276,8 @@ msgstr ""
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr ""
 
@@ -1303,37 +1323,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr ""
 
@@ -1367,14 +1387,14 @@ msgid "Smoothness"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr ""
 
@@ -1442,7 +1462,8 @@ msgstr ""
 msgid "Radius of the circle"
 msgstr ""
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr ""
 
@@ -1465,8 +1486,9 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr ""
 
@@ -1485,7 +1507,7 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr ""
 
@@ -1565,9 +1587,11 @@ msgstr ""
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr ""
 
@@ -1653,10 +1677,10 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr "Loop"
 
@@ -1799,32 +1823,32 @@ msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr ""
 
@@ -1882,13 +1906,20 @@ msgid "When checked the gradient is supersampled"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr ""
 
@@ -1910,6 +1941,7 @@ msgid "Seeds the random number generator"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr ""
 
@@ -1994,8 +2026,9 @@ msgid ""
 "size, and an alpha of 1.0 is used when rendering"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr ""
 
@@ -2003,8 +2036,9 @@ msgstr ""
 msgid "If enabled, render the plant in the opposite direction"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr ""
 
@@ -2215,7 +2249,7 @@ msgstr ""
 msgid "Importer::open(): Unknown file type -- "
 msgstr ""
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr ""
 
@@ -2227,252 +2261,292 @@ msgstr "Z-dybde"
 msgid "Modifies the position of the layer in the layer stack"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr ""
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr "Lærred"
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr "Navn"
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+msgid "First corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+msgid "Second corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+msgid "Horizontal subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:51
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
-msgstr "Kan ikke åbne fil"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2768,7 +2842,7 @@ msgstr ""
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr ""
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr ""
 
@@ -2970,8 +3044,8 @@ msgstr "%s ligner ikke en gyldig %s-paletfil"
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr ""
 
@@ -3011,13 +3085,13 @@ msgstr ""
 msgid "Divide"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr ""
 
@@ -3033,12 +3107,14 @@ msgstr ""
 msgid "Darken"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr ""
 
@@ -3152,230 +3228,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr ""
 
@@ -3384,1319 +3490,1355 @@ msgstr ""
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr "X"
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr "Rød"
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr "Grøn"
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr "Blå"
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr "Længde"
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr "Værdi"
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr "Luma"
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+msgid "The value to be reversed"
+msgstr ""
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr "Segment"
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr "Tid"
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/de.gmo b/po/de.gmo
index 4e14577..dc46ab5 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index d43fe4f..8f16a8f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,6 +5,7 @@
 # Translators:
 # Bernd Kampe <bernd.kampe at gmx.net>, 2014-2015
 # Bernd Kampe <bernd.kampe at gmx.net>, 2014
+# Ettore Atalan <atalanttore at googlemail.com>, 2015
 # morevnaproject <ksee.zelgadis at gmail.com>, 2011
 # Nils Mäser <unsinn10 at gmx.de>, 2014-2015
 # Oliver Horn <oliver.horn at ohoservices.de>, 2011-2013
@@ -12,11 +13,11 @@
 # Nils Mäser <unsinn10 at gmx.de>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-09 22:01+0000\n"
-"Last-Translator: Nils Mäser <unsinn10 at gmx.de>\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:45+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore at googlemail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/synfig/language/"
 "de/)\n"
 "Language: de\n"
@@ -34,14 +35,15 @@ msgstr "Text"
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "Andere"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:97
 msgid "Text Layer"
-msgstr "Text Ebene"
+msgstr "Textebene"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:398
 msgid "unable to initialize"
@@ -61,8 +63,9 @@ msgstr "Zu rendernder Text"
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "Farbe"
 
@@ -72,7 +75,7 @@ msgstr "Farbe des Textes"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:580
 msgid "Font Family"
-msgstr "Schriftart Familie"
+msgstr "Schriftfamilie"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:585
 msgid "Style"
@@ -80,7 +83,7 @@ msgstr "Stil"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr "Normal"
 
@@ -93,7 +96,7 @@ msgid "Italic"
 msgstr "Kursiv"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr "Zeichenbreite"
 
@@ -163,15 +166,18 @@ msgstr "Text Ausrichtung"
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr "Ursprung"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:628
 msgid "Text Position"
-msgstr "Text Position"
+msgstr "Textposition"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:632
 msgid "Font"
@@ -183,7 +189,7 @@ msgstr "Dateiname der zu benutzenden Schriftart"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:640
 msgid "Kerning"
-msgstr "Unterschneiden (kerning)"
+msgstr "Unterschneidung"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:641
 msgid "Enables/Disables font kerning (If the font supports it)"
@@ -201,7 +207,7 @@ msgstr "Dies ausschalten, wenn der Text animiert werden soll"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr "Umkehren"
 
@@ -211,19 +217,19 @@ msgstr "Kein Zeichensatz geladen, es wird kein Text gerendert."
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:742
 msgid "Text too small, no text will be rendered."
-msgstr "Text zu klein wird nicht gerendert"
+msgstr "Text zu klein, kein Text wird gerendert."
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:766
 msgid "Unable to set face size."
-msgstr "Zeichensatzgröße kann nicht gesetzt werden."
+msgstr "Zeichensatzgröße kann nicht festgelegt werden."
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:809
 msgid "Invalid multibyte sequence - is the locale set?\n"
-msgstr "Ungültige multibyte Folge - ist die Locale gesetzt?\n"
+msgstr "Ungültige Multibyte-Folge - ist die Sprachumgebung festgelegt?\n"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:816
 msgid "Can't parse multibyte character.\n"
-msgstr "Kann multibyte Zeichen nicht parsen.\n"
+msgstr "Kann Multibyte-Zeichen nicht parsen.\n"
 
 #: src/modules/lyr_std/bevel.cpp:69 src/modules/mod_example/filledrect.cpp:157
 #: src/modules/mod_geometry/advanced_outline.cpp:1172
@@ -243,30 +249,30 @@ msgstr "Typ"
 #: src/modules/lyr_std/bevel.cpp:627 src/modules/lyr_std/shade.cpp:635
 #: src/modules/mod_filter/blur.cpp:420
 msgid "Type of blur to use"
-msgstr "Typ Unschärfe, die benutzt wird"
+msgstr "Zu verwendender Typ der Unschärfe"
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr "Box Unschärfe"
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr "Schnelle Gausssche Unschärfe"
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr "Cross-Hatch Unschärfe"
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr "Gausssche Unschärfe"
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr "Disc Unschärfe"
 
@@ -292,7 +298,7 @@ msgstr "Weichheit"
 
 #: src/modules/lyr_std/bevel.cpp:654
 msgid "Use Luma"
-msgstr "Benutze Helligkeit"
+msgstr "Helligkeit verwenden"
 
 #: src/modules/lyr_std/bevel.cpp:657
 msgid "Solid"
@@ -353,6 +359,7 @@ msgstr "Linie verwinden"
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr "Störungen"
 
@@ -363,13 +370,14 @@ msgstr "Position der Ziellinie des Pfads"
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr "Breite"
 
@@ -427,17 +435,18 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr "Dateiname ist bereits \"%s\" (%s)"
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr "Dateiname"
 
 #: src/modules/lyr_std/import.cpp:318
 msgid "File to import"
-msgstr "zu importierende Datei"
+msgstr "Zu importierende Datei"
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
-msgstr "Zeitversatz (Offset)"
+msgstr "Zeitversatz"
 
 #: src/modules/lyr_std/import.cpp:323
 msgid "Time Offset to apply to the imported file"
@@ -602,7 +611,8 @@ msgstr "Versatz außen"
 msgid "Scale Outside"
 msgstr "Verlauf außen"
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr "Drehen"
 
@@ -619,12 +629,13 @@ msgstr "Position des Ursprungs"
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr "Menge"
 
@@ -646,7 +657,7 @@ msgid "Spherize"
 msgstr "Spherize"
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr "Position"
 
@@ -661,7 +672,7 @@ msgstr "Mittelpunkt der Sphere Verzerrung"
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr "Radius"
 
@@ -765,12 +776,13 @@ msgstr "Alpha sichern"
 msgid "Avoid alpha artifacts when checked"
 msgstr "Alpha Artefakte vermeiden? "
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr "Zeitschleife"
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr "Verknüpfungs Zeit"
 
@@ -778,16 +790,19 @@ msgstr "Verknüpfungs Zeit"
 msgid "Start time of the loop for the cycled context"
 msgstr "Startzeit der Schleife für die Wiederholung"
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr "Lokale Zeit"
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr "Zeit wann die resultierende Schleife startet"
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr "Dauer"
 
@@ -811,7 +826,8 @@ msgstr "Symetrisch"
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr "Schleifen werden zur lokalen Zeit gespiegelt"
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr "Übersetzen"
 
@@ -920,11 +936,12 @@ msgstr "Mittelpunkt des Musters"
 msgid "Size of the pattern"
 msgstr "Größe des Musters"
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr "Maßstab"
 
@@ -1014,13 +1031,14 @@ msgstr "Beispiel"
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr "Füllfarbe der Ebene"
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr "Punkt 1"
 
@@ -1032,6 +1050,7 @@ msgstr "Erste Ecke des Rechtecks"
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr "Punkt 2"
 
@@ -1071,9 +1090,9 @@ msgstr "Metaballs"
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr "Verlauf"
 
@@ -1142,7 +1161,7 @@ msgid "Blur"
 msgstr "Unschärfe"
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr "Unschärfen"
 
@@ -1170,7 +1189,8 @@ msgstr "Kontrast"
 msgid "Exposure Adjust"
 msgstr "Belichtungsanpssung"
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr "Gamma-Anpassung"
 
@@ -1270,7 +1290,8 @@ msgstr "Erweiterte Umrandung"
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr "Geometrie"
 
@@ -1317,37 +1338,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr "abgerundet"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr "eckig"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr "spitz"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr "flach"
 
@@ -1381,16 +1402,17 @@ msgid "Smoothness"
 msgstr "Sanft"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+#, fuzzy
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 "Bestimmt die Sanftheit der Linienränder der Umrandung zwischen "
 "Breitenpunkten. (0) Linear (1) Sanft"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr "Homogen"
 
@@ -1458,7 +1480,8 @@ msgstr "Kreis"
 msgid "Radius of the circle"
 msgstr "Radius des Kreises"
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr "Unschärfe"
 
@@ -1481,8 +1504,9 @@ msgstr "Legt die Abschwächfunktion für Unschärfe fest"
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr "Linear"
 
@@ -1501,7 +1525,7 @@ msgstr "Sigmond"
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr "Cosinus"
 
@@ -1581,9 +1605,11 @@ msgstr "Der Radius der inneren Punkte des Sterns"
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr "Winkel"
 
@@ -1669,10 +1695,10 @@ msgstr "Globale Breite des Verlaufs"
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr "Schleife"
 
@@ -1815,32 +1841,32 @@ msgstr "verändern der Quelle des Zufallsrauschens"
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr "Interpolation"
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr "Art der Interpolation, die benutzt werden soll "
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr "Nächster Nachbar"
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr "Pfad"
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr "Kubisch"
 
@@ -1898,13 +1924,20 @@ msgid "When checked the gradient is supersampled"
 msgstr "Super sampling des Verlaufs"
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr "Verbindung (Link)"
 
@@ -1926,6 +1959,7 @@ msgid "Seeds the random number generator"
 msgstr "Startwert für Zufallszahlen"
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr "Geschwindigkeit"
 
@@ -2013,8 +2047,9 @@ msgstr ""
 "wenn ausgewählt wird der Alpha Kanal des Verlaufs multipliziert mit der "
 "Stängelgröße audn Alpha Wert 1.0 wird für das Rendering verwendet "
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr "Umgekehrt"
 
@@ -2022,8 +2057,9 @@ msgstr "Umgekehrt"
 msgid "If enabled, render the plant in the opposite direction"
 msgstr "falls ausgewählt, die Pflanze in umgekehrter Richtung rendern"
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr "Schritt"
 
@@ -2238,7 +2274,7 @@ msgstr "Importer::open(): Erweiterung nicht gefunden"
 msgid "Importer::open(): Unknown file type -- "
 msgstr "Importer::open(): unbekannter Dateityp --"
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr "Zieloberfläche kann nicht erzeugt werden"
 
@@ -2250,253 +2286,296 @@ msgstr "Z Tiefe"
 msgid "Modifies the position of the layer in the layer stack"
 msgstr "Verändert die Position der Ebene im Stapel der Ebenen"
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr "Oben-Links"
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr "Obere linke Ecke des BIldes"
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr "Unten-Rechts"
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr "Untere rechte Ecke des BIldes"
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr "Alpha Kanal der Ebene"
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr "Mischmethode"
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr "Mischmethode für die tiefer liegenden Ebenen"
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr "Doppelt"
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr "Index"
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr "Index kopieren"
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr "[MIME]"
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr "Bewegungsunschärfe"
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr "Blende"
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr "Verschlußzeit"
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr "Subsample Faktor"
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr "Multipliziert die Anzahl der gerenderten Subsamples "
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr "Subsampling Typ"
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr "Linientyp für Gewichtung der Subsamles "
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr "Konstant"
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr "Hyperbel"
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr "Subsample Start Anzahl "
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr "Relativer Wert des ersten Subsample, für lineare Gewichtung "
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr "Subsample Endwert"
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr "Relativer Wert des letzten Subsample, für lineare Gewichtung "
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr "Positionsversatz"
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr "Transformation"
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr "Position, Rotation, Neigung und Skalierung"
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr "Animation"
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr "Gruppeninhalt"
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr "Zeitversatz der auf den Kontext angewendet wird"
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr "Auswahl sperren"
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr "sperrt Untergeordnete für Mausklick Auswahl"
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr "Wachstum der Umrandung"
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr "Exponentieller Wert für Breitenwachstum der Umrandung Untergeordneter"
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr "Aktuelle Zeit"
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr "Vieleck (Polygon)"
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr "Eckpunkt Liste"
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr "definiere die Ecken des Vielecks"
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr "Form"
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr "Intern"
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr "Farbe der Ebene"
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
-msgstr "Antialiasing"
+msgstr "Kantenglättung"
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr "Art der Unschärfe"
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr "zu benutzende Art der Unschärfe"
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr "Kurvenreicher Stil"
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr "zu benutzender Kurvenreicher Stil "
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr "Nicht Null"
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr "Gerade/Ungerade"
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr "Skelett"
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr "Name"
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr "Knochen"
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+#, fuzzy
+msgid "Skeleton Deformation"
+msgstr "Transformation"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+#, fuzzy
+msgid "First corner of the bounds rectangle"
+msgstr "Erste Ecke des Rechtecks"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+#, fuzzy
+msgid "Second corner of the bounds rectangle"
+msgstr "Zweite Ecke des Rechtecks"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+#, fuzzy
+msgid "Horizontal subdivisions"
+msgstr "Horizontaler Abstand"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr "Farbfläche"
 
-#: src/synfig/layer_sound.cpp:51
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
-msgstr "Gerundet"
+msgstr "Ton"
 
-#: src/synfig/layer_sound.cpp:102
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
-msgstr "Datei kann nicht geöffnet werden"
+msgstr "Pfad zur Tondatei"
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
-msgstr ""
+msgstr "Verzögerung"
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
-msgstr ""
+msgstr "Verzögerung vor dem Abspielen"
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
-msgstr ""
+msgstr "Lautstärke"
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
-msgstr ""
+msgstr "Lautstärke des Tons"
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr "Schalter"
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr "Aktive Ebene"
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr "Nur die hier angegebene Ebene ist sichtbar"
 
@@ -2803,7 +2882,7 @@ msgstr "leeres \"Author\" Feld"
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr "Animation '%s' hat nicht definiertes %s: %s"
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr "Wertknoten"
 
@@ -2846,67 +2925,67 @@ msgstr "Ebenengröße Abweichung (app:%d, lib:%d)"
 
 #: src/synfig/main.cpp:215
 msgid "Starting Subsystem \"Sound\""
-msgstr "Starte das Subsystem \"Sound\""
+msgstr "Untersystem \"Ton\" wird gestartet"
 
 #: src/synfig/main.cpp:217
 msgid "Unable to initialize subsystem \"Sound\""
-msgstr "Subsystem \"Sound\" kann nicht initialisiert werden"
+msgstr "Untersystem \"Ton\" kann nicht initialisiert werden"
 
 #: src/synfig/main.cpp:219
 msgid "Starting Subsystem \"Types\""
-msgstr "Starte Subsystem  \"Types\""
+msgstr "Untersystem \"Typen\" wird gestartet"
 
 #: src/synfig/main.cpp:221
 msgid "Unable to initialize subsystem \"Types\""
-msgstr "Subsystem \"Types\" kann nicht initialisiert werden"
+msgstr "Untersystem \"Typen\" kann nicht initialisiert werden"
 
 #: src/synfig/main.cpp:223
 msgid "Starting Subsystem \"Modules\""
-msgstr "Starte Subsystem \"Modules\""
+msgstr "Untersystem \"Module\" wird gestartet"
 
 #: src/synfig/main.cpp:227
 msgid "Unable to initialize subsystem \"Modules\""
-msgstr "Subsystem \"Modules\" kann nicht initialisiert werden"
+msgstr "Untersystem \"Module\" kann nicht initialisiert werden"
 
 #: src/synfig/main.cpp:230
 msgid "Starting Subsystem \"Layers\""
-msgstr "Starte Subsystem \"Layers\""
+msgstr "Untersystem \"Ebenen\" wird gestartet"
 
 #: src/synfig/main.cpp:235
 msgid "Unable to initialize subsystem \"Layers\""
-msgstr "Subsystem \"Layers\" kann nicht initialisiert werden"
+msgstr "Untersystem \"Ebenen\" kann nicht initialisiert werden"
 
 #: src/synfig/main.cpp:238
 msgid "Starting Subsystem \"Targets\""
-msgstr "Starte Subsystem \"Targets\""
+msgstr "Untersystem \"Ziele\" wird gestartet"
 
 #: src/synfig/main.cpp:244
 msgid "Unable to initialize subsystem \"Targets\""
-msgstr "Subsystem \"Targets\" kann nicht initialisiert werden"
+msgstr "Untersystem \"Ziele\" kann nicht initialisiert werden"
 
 #: src/synfig/main.cpp:247
 msgid "Starting Subsystem \"Importers\""
-msgstr "Starte Subsystem \"Importers\""
+msgstr "Untersystem \"Importierer\" wird gestartet"
 
 #: src/synfig/main.cpp:254
 msgid "Unable to initialize subsystem \"Importers\""
-msgstr "Subsystem \"Importers\" kann nicht initialisiert werden"
+msgstr "Untersystem \"Importierer\" kann nicht initialisiert werden"
 
 #: src/synfig/main.cpp:257
 msgid "Starting Subsystem \"Cairo Importers\""
-msgstr "Starte Subsystem \"Cairo Importers\""
+msgstr "Untersystem \"Cairo-Importierer\" wird gestartet"
 
 #: src/synfig/main.cpp:265
 msgid "Unable to initialize subsystem \"Cairo Importers\""
-msgstr "Subsystem \"Cairo Importers\" kann nicht initialisiert werden"
+msgstr "Untersystem \"Cairo-Importierer\" kann nicht initialisiert werden"
 
 #: src/synfig/main.cpp:268
 msgid "Starting Subsystem \"ValueNodes\""
-msgstr "Starte Subsystem \"ValueNodes\""
+msgstr "Untersystem \"WertKnoten\" wird gestartet"
 
 #: src/synfig/main.cpp:277
 msgid "Unable to initialize subsystem \"ValueNodes\""
-msgstr "Subsystem \"ValueNodes\" kann nicht initialisiert werden"
+msgstr "Untersystem \"WertKnoten\" kann nicht initialisiert werden"
 
 #: src/synfig/main.cpp:314 src/synfig/main.cpp:315
 #, c-format
@@ -3005,8 +3084,8 @@ msgstr "%s scheint keine gültige %s Palettendatei zu sein"
 msgid "%s does not appear to be a supported palette file"
 msgstr "%s scheint keine unterstützte Palettendatei zu sein"
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr "Verbund"
 
@@ -3046,13 +3125,13 @@ msgstr "Multiplizieren"
 msgid "Divide"
 msgstr "Teilen"
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr "Subtrahieren"
 
@@ -3068,12 +3147,14 @@ msgstr "Aufhellen"
 msgid "Darken"
 msgstr "Abdunkeln"
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr "Farbton"
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr "Sättigung"
 
@@ -3190,230 +3271,260 @@ msgstr ""
 "Time(): Keine Einheit in time code und Bildrate ist unbekannt! Annahme "
 "SEKUNDEN"
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr "Radialer Verbund"
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr "Referenz"
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr "Segment Tangente"
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr "Segment Eckpunkt"
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr "Streifen"
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr "Zweifarbig"
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr "Dynamische Liste"
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr "Kreisförmiger Verlauf"
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr "Sinus"
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr "Zeitgesteuerter Wechsel"
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr "Verlauf wiederholen"
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr "Eponentiell"
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr "Pfadtangente"
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr "Pfadeckpunkt"
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr "Bereich"
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr "Cos"
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr "aTan2"
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr "Umgekehrte Tangenten"
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr "Reziprok"
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr "Ganzzahl"
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr "Pfadbreite"
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr "Vektor Winkel"
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr "Vektor Länge"
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr "Vektor X"
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr "Vektor Y"
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr "Farbe für Verlauf"
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr "Skalarprodukt"
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr "Zeit Zeichenkette"
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr "Reell"
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr "Reelle Zahl Zeichenkette"
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr "Vereinigte Liste"
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr "Winkel Zeichenkette"
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr "Ganzzahl Zeichenkette"
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr "Logarithmus"
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr "Ausgegraut"
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr "Ladung"
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr "Vergleichen"
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr "Nicht"
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr "Und"
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr "Oder"
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr "Knochen-Beeinflussung"
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr "Knochen"
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr "Übergeordneter Knochen"
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr "Statische Liste"
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr "Knochen-Gewichts-Paar"
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr "Knochenverknüpfung"
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr "Wegpunktliste"
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr "Strichliste"
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr "Mittelwert"
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr "Gewichtetes Mittel"
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr "Dynamisch"
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr "Ableitung"
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr "Ungültiger Typ: Wertknoten '%s' akzeptiert Typ '%s' nicht"
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr "Platzhalter"
 
@@ -3422,1274 +3533,1310 @@ msgstr "Platzhalter"
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr "%s:%d falscher Typ für %s: benötigt %s aber erhielt %s"
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ":Ungültiger Typ"
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr "Einer oder beide meiner Parameter sind nicht gesetzt!"
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr "Linke Seite"
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr "Linke Seite der Addition"
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr "Rechte Seite"
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr "Rechte Seite der Addition"
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr "Skalar"
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr "Wert multipliziert das Hinzugefügte"
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr "UND"
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr "Verknüpfung1"
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr "Erster Operand der UND Operation"
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr "Verknüpfung2"
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr "Zweiter Operand der UND Operation"
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr "Wert zur Umwandlung in Zeichenkette"
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr "Breite der Zeichenkette"
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr "Genauigkeit"
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr "Dezimalstellen"
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr "mit Nullen aufgefüllt"
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr "links mit Nullen auffüllen?"
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr "Ein Wegpunkt existiert bereits zu diesem Zeitpunkt"
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr "%s: Es kann kein %s in einem animierten Wertknoten verwendet werden"
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr "Animiert"
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr "X"
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr "Cosinus des Winkels"
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr "Y"
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr "Sinus des Winkels"
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr "Keine Einträge in der Liste"
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr "Keine Einträge in der Liste ret_list"
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr "Eckpunkt %03d"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr "Pfad, an den die Tangente verbunden ist"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr "Wert wiederholen"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr "Position der verbundenen Tangente am Pfads (0,1]"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr "Versatz"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr "Winkelabweichung der Tangente"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr "Maßstab der Tangente"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr "Feste Länge"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr "feste Länge der Tangente?"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr "Tangente basiert auf Pfadlänge"
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr "Pfad, zu dem der Eckpunkt gehört"
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr "Position des verbundenen Eckpunkts am Pfad (0,1]"
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr "Position basiert auf Pfadlänge"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr "Pfad, zu dem die Breite gehört"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr "Position der verbundenen Breite am Pfad (0,1]"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr "Maßstab der Breite"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr "Breite basiert auf Pfadlänge"
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr "Referenzierte Tangente zum Umkehren"
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr "Wenn gesetzt, wird die Referenz umgekehrt"
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr "Knochen %d"
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr "Der Name des Knochens"
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr "Übergeordneter Knochen"
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr "Der übergeordnete Knochen dieses Knochens"
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr "Der Ursprung des Knochens, relativ zum übergeordneten Knochen"
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr "Der Rotationswinkel, relativ zum übergeordneten Knochen"
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr "Lokale Längenskalierung"
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 "Die lokale Längenskalierung bestimmt nur die Länge dieses einzelnen Knochens"
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr "Knochenbreite"
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr "Knochenbreite am Ursprung"
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr "Rekursive Längenskalierung"
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 "Die rekursive Längenskalierung wirkt sich sowohl auf die Länge dieses "
 "Knochens, als auch die Länge aller untergeordneten Knochen, aus."
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr "Spitzenbreite"
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr "Knochenbreite an der Spitze"
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr "Z-Tiefe"
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr "Die Z-Tiefe des Knochens"
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr "Basislänge"
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 "Bestimmt die Basislänge des Knochens und den Ursprung für neue Unterknoten"
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr "Wurzel"
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr "Knochen-Gewichts-Liste"
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr "Liste der Knochen, die zum Berechnen der Verzerrung benutzt wurden"
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr "Der durch Knochen beeinflusste Wertknoten"
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr "Der verknüpfte Knochen"
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr "Basiswert"
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr "Knochen verschieben"
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr "Knochen drehen"
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr "Neigung"
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr "Neigen"
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr "X skalieren"
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr "In X-Richtung skalieren"
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr "Y skalieren"
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr "In Y-Richtung skalieren"
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr "Knochen, der für die Verzerrung genutzt wird"
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr "Gewicht"
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr "Relativer Einfluss, den der Knochen auf die Verzerrung hat"
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr "Linke Seite des Vergleichs (L)"
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr "Rechte Seite des Vergleichs (R)"
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr "Größer"
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr "L > R ?"
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr "Gleich"
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr "L = R ?"
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr "Kleiner"
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr "L < R ?"
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr "Ungültiger Typ für Komposit"
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr "Rot"
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr "Rotanteil der Farbe"
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr "Grün"
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr "Grünanteil der Farbe"
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr "Blau"
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr "Blauanteil der Farbe"
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr "Alpha"
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr "Alphawert der Farbe (Transparenz)"
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr "Eckpunkt 1"
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr "Erster Eckpunkt des Segments"
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr "Tangente 1"
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr "Erste Tangente des Segments"
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr "Eckpunkt 2"
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr "Zweiter Eckpunkt des Segments"
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr "Tangente 2"
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr "Zweite Tangente des Segments"
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr "X Achse"
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr "X Achsen Anteil des Vektors"
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr "Y Achse"
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr "Y Achsen Anteil des Vektors"
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr "Eckpunkt"
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr "Eckpunkt des Pfadpunkts"
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr "Breite des Pfadpunkts "
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr "Off und On Positionen relativ zu den Nachbarn"
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr "Aufspaltung"
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr "Tangenten aufteilen"
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr "Erste Tangente des Pfadpunkts"
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr "Zweite Tangente des Pfadpunkts"
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr "Radius aufgeteilt"
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr "Radien der Tangenten aufteilen"
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr "Winkel aufgeteilt"
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr "Winkel der Tangenten aufteilen"
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr "Position des Breitenpunkts innerhalb [0,1] auf dem Pfad"
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr "Breite des Breitenpunkts"
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr "Seitentyp davor"
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr "Interpolationstyp des Breitenpunkts"
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr "Interpolieren"
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr "Seitentyp danach"
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr "Untere Grenze"
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr "Bestimmt die Position am Anfang des Pfads"
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr "Obere Grenze"
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr "Bestimmt die Position am Ende des Pfads"
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr "Verschiebung des Strichs auf dem Pfad"
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr "Länge"
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr "Länge des Strichs"
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr "Seitentyp Strich"
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr "Der Versatz bzw. die Verschiebung der Ebene für die Transformation"
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr "Rotationswinkel für die Transformation"
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr "Neigungswinkel"
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 "Über den Neigungswinkel lässt sich die Ebene schräg stellen, bzw. kursiv "
 "machen."
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr "Skalierung für die Transformation"
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr "Das Gewicht des Wertes"
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr "Wert"
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr "Der Wert"
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr "Erster"
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr "Der Anfang"
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr "Zweiter"
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr "Das Ende"
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr "Wert für Cosinus Berechnung"
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr "Amplitude"
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr "Multiplikator des resultierenden Cosinus"
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr "Wert zum Berechnen der Ableitung"
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr "Intervall"
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr "Zeitintervall zum Berechnen der endlichen Unterschiede"
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr "Genauigkeit"
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr "Genauigkeit der Ableitung"
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr "Grob"
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr "Fein"
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr "Extrem"
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr "Grad"
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr "Grad der Ableitung"
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr "Erste Ableitung"
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr "Zweite Ableitung"
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr "Strich %03d"
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr "Die linke Seite des Skalarprodukts"
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr "Die rechte Seite des Skalarprodukts"
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr "Von"
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr "Startwert des Indexes"
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr "Bis"
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr "Endwert des Indexes"
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr "Werterhöhung des Index"
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr "Spitze statisch"
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr "Position des Gleichgewichtspunkts ohne externe Kräfte"
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr "Fundament des dynamischen Systems"
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr "Kraft"
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr "Äußere Kraft, die auf den Massenschwerpunkt wirkt"
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr "Drehmoment"
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr "Externer Impuls auf das Trägeheitszentrum"
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr "Dämpfungskonstante"
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr "Radiale Dämpfungskonstante des dynamischen Systems"
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr "Reibungskoeffizient"
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr "Reibungskoeffizient bei Rotation des dynamischen Systems"
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr "Federkonstante"
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr "Radiale Federkonstante des dynamischen Systems"
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr "Torsionskonstante"
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr "Torsionskonstante des dynamischen Systems"
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr "Masse"
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr "Masse des dynamischen Systems"
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr "Trägheitsmoment"
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr "Trägheitsmoment des dynamischen Systems"
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr "Federsteifigkeit"
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr "Wenn gesetzt, ist die lineare Feder steif"
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr "Torsionssteifigkeit"
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr "Wenn gesetzt, ist die Torsionsfeder steif"
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr "Spitze folgt Ursprung"
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 "Wenn gesetzt, ist das Ergebnis die Summe aus Ursprung + Spitze, ansonsten "
 "nur die Spitze"
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr "Listentyp/Gegenstandstyp Abweichung, Abweichung wird verworfen"
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr "Gegenstand %03d"
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr "Exponent"
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr "Werterhöhung der Konstante 'e'"
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr "Multiplikant des Ergebnisses"
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr "Verlauf, von dem die Farbe gewählt wird"
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr "Die Position der Farbe im Verlauf (0,1]"
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr "Wenn gesetzt, wird der Index wiederholt"
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr "Zu rotierender Quellverlauf "
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr "Verschiebung des Verlaufs"
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr "Der ausgegraute Wert"
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr "umzuwandelnder Ganzzahlwert "
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr "Ganzzahl"
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr "Zeichenkette"
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr "Liste der zu verkettenden Zeichenketten"
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr "Davor"
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr "Zeichenkette vor den verketteten"
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr "Separator"
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr "Zeichenkette die als Separator eingefügt wird"
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr "Dahinter"
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr "Zeichenkette hinter den verketteten"
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr "Rate"
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr "Wert, der mit der aktuellen Zeit (in Sekunden) multipliziert wird"
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr "Neigung"
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr "Rückgabewert für aktuelle Zeit gleich Null"
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr "Wertknoten für die Berechnung des natürlichen Algorithmus"
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr "Epsilon"
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr "Wert für den Vergleich der Verbindung mit Null."
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr "Unendlich"
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr "Rückgabewert wenn es gegen unendlich strebt"
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr "NICHT"
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr "Wertverknüpfung für NICHT Operation"
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr "ODER"
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr "Wertverknüpfung für ODER Operation"
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr "Basis"
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr "Basis (Potenzieren)"
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr "Exponent (Potenzieren)"
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr "Wert zum Vergleich Basis und Power mit Null"
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr "Ungültiger Typ für Radialkomposit"
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr "Helligkeit"
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr "Länge des Vektors"
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr "Theta"
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr "Winkel des Vektors zur X-Achse"
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr "Manche meiner Parameter sind nicht gesetzt!"
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr "Min"
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr "Rückgabewert wenn kleiner"
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr "Max"
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr "Rückgabewert wenn größer"
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr "Wertknoten zur Begrenzung des Bereichs"
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr "Umzuwandelnde reelle Zahl"
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr "Wertknoten zur Berechnung des Reziprokwerts"
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr "Wert zur Entscheidung ob 'Link' zu klein für Reziprokwert "
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr "Ergebniswert für 'Link' < 'Epsilon'"
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr "Referenzierter Wert"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr "Quellverlauf für Wiederholung"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr "Zähler"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr "Wiederholungen des Verlaufs"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 "Gibt an, wie stark sich der Quellverlauf auf die Wiederholung [0,1] auswirkt."
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr "Start festlegen"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr "Startfarbe als Start für Verlauf verwenden?"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr "Ende festlegen"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr "Endfarbe als Start für Verlauf verwenden?"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr "Startfarbe"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr "als Start für den Verlauf"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr "Endfarbe"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr "als Ende für den Verlauf"
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+#, fuzzy
+msgid "The value to be reversed"
+msgstr "Umzuwandelnde reelle Zahl"
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr "Versuch die Umkehrung eines nicht umkehrbaren Wertknotens"
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr "Wertknoten für Skalierung"
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr "Multiplikationswert des Wertknotens"
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr "Segment"
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr "Segment der verbundenen Tangente"
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr "Tangenteposition im Segment (0,1]"
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr "Segment des verbundenen Eckpunkts"
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr "Position des verbundenen Eckpunkts im Segment (0,1]"
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr "Winkel zur Sinuserrechnung"
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr "Multiplikationswert des Sinus"
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr "Wertknoten für den Schritt"
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr "Dauer des Schritts"
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr "Start Zeit"
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr "Zeit zu der die Schrittveränderung startet"
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr "Unterteilung"
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 "Mit diesem Wert kann angegeben werden, ob der Schritt zwischen [0,1] "
 "zentriert ist"
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr "Farbe 1"
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr "eine Farbe der Verlaufsstreifen"
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr "Farbe 2"
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr "andere Farbe der Verlaufsstreifen"
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr "Streifen Zahl"
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr "Anzahl der Streifen im Verlauf"
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr "Breite der Streifen im Verlauf dazwischen [0,1]"
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr "Linke Seite der Subtraktion"
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr "Rechte Seite der Subtraktion"
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr "Multiplikator für die Subtraktion"
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr "Verbindung aus"
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr "Wertknoten für 'aus'"
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr "Verbindung an"
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr "Wertknoten für 'an'"
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr "Wenn gewählt 'Verbindung an', sonst 'Verbindung aus'"
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr "Wertknoten wenn aktuelle Zeit ist vor 'time' -  'length'"
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr "Wertknoten wenn aktuelle Zeit nach 'time'"
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr "Zeit"
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr "Zeit wann die lineare Interpolation endet"
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
@@ -4697,57 +4844,58 @@ msgstr ""
 "Zeitdauer während der die lineare Interpolation zwischen 'davor' und "
 "'danach' ausgeführt wird"
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr "Wertknoten für Zeitschleife"
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr "Länge der Schleife"
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr "in Zeichenkette umzuwandelnde Zeit"
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr "Startfarbe des Verlaufs"
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr "Endfarbe des Verlaufs"
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr "Vektor"
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr "Vektor zur Winkelberechnung"
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr "Vektor zur Längenberechnung"
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr "Vektor zur X-Koordinatenberechnung"
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr "Vektor zur Y-Koordinatenberechnung"
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr "gewichtetes Mittel"
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr "Breitenpunkt %03d"
@@ -5077,7 +5225,7 @@ msgstr "\tHinweis: "
 #: src/tool/optionsprocessor.cpp:340
 #, c-format
 msgid "Antialiasing set to %d, (%d samples per pixel)"
-msgstr "Antialiasing gesetzt auf %d, (%d Samples pro Pixel)"
+msgstr "Kantenglättung festgelegt auf %d, (%d Abtastwerte pro Pixel)"
 
 #: src/tool/optionsprocessor.cpp:347
 #, c-format
@@ -5115,7 +5263,7 @@ msgstr "Der Gamma-Wert wird momentan ignoriert"
 #: src/tool/optionsprocessor.cpp:427
 #, c-format
 msgid "Resolution set to %dx%d."
-msgstr ""
+msgstr "Auflösung festgelegt auf %dx%d."
 
 #: src/tool/optionsprocessor.cpp:444
 msgid "Both video codec and bitrate parameters are necessary."
@@ -5128,11 +5276,11 @@ msgstr "Videocodec \"%s\" wird nicht unterstützt"
 
 #: src/tool/optionsprocessor.cpp:474
 msgid "Target video codec set to: "
-msgstr ""
+msgstr "Zielvideocodec festgelegt auf: "
 
 #: src/tool/optionsprocessor.cpp:480
 msgid "Target bitrate set to: "
-msgstr ""
+msgstr "Zielbitrate festgelegt auf: "
 
 #: src/tool/optionsprocessor.cpp:486
 msgid "Output file sequence separator set to: '"
diff --git a/po/el_GR.gmo b/po/el_GR.gmo
index 02058f7..ba115b6 100644
Binary files a/po/el_GR.gmo and b/po/el_GR.gmo differ
diff --git a/po/el_GR.po b/po/el_GR.po
index df4a111..0487f7b 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,10 +7,10 @@
 # Γιάννης Κασκαμανίδης <kiolalis at gmail.com>, 2011-2012
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/synfig/"
 "language/el_GR/)\n"
@@ -29,8 +29,9 @@ msgstr "Κείμενο"
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "Άλλο"
 
@@ -56,8 +57,9 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "Χρώμα"
 
@@ -75,7 +77,7 @@ msgstr "Στυλ"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr ""
 
@@ -88,7 +90,7 @@ msgid "Italic"
 msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr ""
 
@@ -158,9 +160,12 @@ msgstr ""
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr ""
 
@@ -194,7 +199,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr ""
 
@@ -239,27 +244,27 @@ msgid "Type of blur to use"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr ""
 
@@ -346,6 +351,7 @@ msgstr ""
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr ""
 
@@ -356,13 +362,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr ""
 
@@ -420,7 +427,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr ""
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr ""
 
@@ -428,7 +435,8 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr ""
 
@@ -595,7 +603,8 @@ msgstr ""
 msgid "Scale Outside"
 msgstr ""
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr ""
 
@@ -612,12 +621,13 @@ msgstr ""
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr ""
 
@@ -639,7 +649,7 @@ msgid "Spherize"
 msgstr ""
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr ""
 
@@ -654,7 +664,7 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr "Ακτίνα"
 
@@ -758,12 +768,13 @@ msgstr ""
 msgid "Avoid alpha artifacts when checked"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr ""
 
@@ -771,16 +782,19 @@ msgstr ""
 msgid "Start time of the loop for the cycled context"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr ""
 
@@ -804,7 +818,8 @@ msgstr ""
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr ""
 
@@ -913,11 +928,12 @@ msgstr ""
 msgid "Size of the pattern"
 msgstr ""
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr ""
 
@@ -1007,13 +1023,14 @@ msgstr "Παράδειγμα"
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr "Χρώμα γεμίσματος της στρώσης"
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr "Σημείο 1"
 
@@ -1025,6 +1042,7 @@ msgstr ""
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr "Σημείο 2"
 
@@ -1064,9 +1082,9 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr ""
 
@@ -1130,7 +1148,7 @@ msgid "Blur"
 msgstr ""
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr ""
 
@@ -1158,7 +1176,8 @@ msgstr ""
 msgid "Exposure Adjust"
 msgstr ""
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr ""
 
@@ -1258,7 +1277,8 @@ msgstr ""
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr ""
 
@@ -1304,37 +1324,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr ""
 
@@ -1368,14 +1388,14 @@ msgid "Smoothness"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr ""
 
@@ -1443,7 +1463,8 @@ msgstr ""
 msgid "Radius of the circle"
 msgstr ""
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr ""
 
@@ -1466,8 +1487,9 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr ""
 
@@ -1486,7 +1508,7 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr ""
 
@@ -1566,9 +1588,11 @@ msgstr ""
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr ""
 
@@ -1654,10 +1678,10 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr ""
 
@@ -1800,32 +1824,32 @@ msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr ""
 
@@ -1883,13 +1907,20 @@ msgid "When checked the gradient is supersampled"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr ""
 
@@ -1911,6 +1942,7 @@ msgid "Seeds the random number generator"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr ""
 
@@ -1995,8 +2027,9 @@ msgid ""
 "size, and an alpha of 1.0 is used when rendering"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr ""
 
@@ -2004,8 +2037,9 @@ msgstr ""
 msgid "If enabled, render the plant in the opposite direction"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr ""
 
@@ -2216,7 +2250,7 @@ msgstr ""
 msgid "Importer::open(): Unknown file type -- "
 msgstr ""
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr ""
 
@@ -2228,251 +2262,292 @@ msgstr ""
 msgid "Modifies the position of the layer in the layer stack"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr ""
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+msgid "First corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+msgid "Second corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+msgid "Horizontal subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:51
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2768,7 +2843,7 @@ msgstr ""
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr ""
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr ""
 
@@ -2970,8 +3045,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr ""
 
@@ -3011,13 +3086,13 @@ msgstr ""
 msgid "Divide"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr ""
 
@@ -3033,12 +3108,14 @@ msgstr ""
 msgid "Darken"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr ""
 
@@ -3152,230 +3229,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr ""
 
@@ -3384,1319 +3491,1355 @@ msgstr ""
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+msgid "The value to be reversed"
+msgstr ""
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/en_CZ.gmo b/po/en_CZ.gmo
new file mode 100644
index 0000000..4e8c44b
Binary files /dev/null and b/po/en_CZ.gmo differ
diff --git a/po/bs.po b/po/en_CZ.po
similarity index 71%
copy from po/bs.po
copy to po/en_CZ.po
index 79dd9e2..a50d88e 100644
--- a/po/bs.po
+++ b/po/en_CZ.po
@@ -5,19 +5,18 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
-"Language-Team: Bosnian (http://www.transifex.com/projects/p/synfig/language/"
-"bs/)\n"
-"Language: bs\n"
+"Language-Team: English (Czech Republic) (http://www.transifex.com/projects/p/"
+"synfig/language/en_CZ/)\n"
+"Language: en_CZ\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:66
 #: src/modules/lyr_freetype/lyr_freetype.cpp:569
@@ -28,8 +27,9 @@ msgstr ""
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr ""
 
@@ -55,8 +55,9 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr ""
 
@@ -74,7 +75,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr ""
 
@@ -87,7 +88,7 @@ msgid "Italic"
 msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr ""
 
@@ -157,9 +158,12 @@ msgstr ""
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr ""
 
@@ -193,7 +197,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr ""
 
@@ -238,27 +242,27 @@ msgid "Type of blur to use"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr ""
 
@@ -345,6 +349,7 @@ msgstr ""
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr ""
 
@@ -355,13 +360,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr ""
 
@@ -419,7 +425,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr ""
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr ""
 
@@ -427,7 +433,8 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr ""
 
@@ -594,7 +601,8 @@ msgstr ""
 msgid "Scale Outside"
 msgstr ""
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr ""
 
@@ -611,12 +619,13 @@ msgstr ""
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr ""
 
@@ -638,7 +647,7 @@ msgid "Spherize"
 msgstr ""
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr ""
 
@@ -653,7 +662,7 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr ""
 
@@ -757,12 +766,13 @@ msgstr ""
 msgid "Avoid alpha artifacts when checked"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr ""
 
@@ -770,16 +780,19 @@ msgstr ""
 msgid "Start time of the loop for the cycled context"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr ""
 
@@ -803,7 +816,8 @@ msgstr ""
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr ""
 
@@ -912,11 +926,12 @@ msgstr ""
 msgid "Size of the pattern"
 msgstr ""
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr ""
 
@@ -1006,13 +1021,14 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr ""
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr ""
 
@@ -1024,6 +1040,7 @@ msgstr ""
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr ""
 
@@ -1063,9 +1080,9 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr ""
 
@@ -1129,7 +1146,7 @@ msgid "Blur"
 msgstr ""
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr ""
 
@@ -1157,7 +1174,8 @@ msgstr ""
 msgid "Exposure Adjust"
 msgstr ""
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr ""
 
@@ -1257,7 +1275,8 @@ msgstr ""
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr ""
 
@@ -1303,37 +1322,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr ""
 
@@ -1367,14 +1386,14 @@ msgid "Smoothness"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr ""
 
@@ -1442,7 +1461,8 @@ msgstr ""
 msgid "Radius of the circle"
 msgstr ""
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr ""
 
@@ -1465,8 +1485,9 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr ""
 
@@ -1485,7 +1506,7 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr ""
 
@@ -1565,9 +1586,11 @@ msgstr ""
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr ""
 
@@ -1653,10 +1676,10 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr ""
 
@@ -1799,32 +1822,32 @@ msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr ""
 
@@ -1882,13 +1905,20 @@ msgid "When checked the gradient is supersampled"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr ""
 
@@ -1910,6 +1940,7 @@ msgid "Seeds the random number generator"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr ""
 
@@ -1994,8 +2025,9 @@ msgid ""
 "size, and an alpha of 1.0 is used when rendering"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr ""
 
@@ -2003,8 +2035,9 @@ msgstr ""
 msgid "If enabled, render the plant in the opposite direction"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr ""
 
@@ -2215,7 +2248,7 @@ msgstr ""
 msgid "Importer::open(): Unknown file type -- "
 msgstr ""
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr ""
 
@@ -2227,251 +2260,292 @@ msgstr ""
 msgid "Modifies the position of the layer in the layer stack"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr ""
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+msgid "First corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+msgid "Second corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+msgid "Horizontal subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:51
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2767,7 +2841,7 @@ msgstr ""
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr ""
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr ""
 
@@ -2969,8 +3043,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr ""
 
@@ -3010,13 +3084,13 @@ msgstr ""
 msgid "Divide"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr ""
 
@@ -3032,12 +3106,14 @@ msgstr ""
 msgid "Darken"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr ""
 
@@ -3151,230 +3227,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr ""
 
@@ -3383,1319 +3489,1355 @@ msgstr ""
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+msgid "The value to be reversed"
+msgstr ""
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
index 294e067..608de51 100644
Binary files a/po/en_GB.gmo and b/po/en_GB.gmo differ
diff --git a/po/en_GB.po b/po/en_GB.po
index 658eccc..26d65c2 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -15,10 +15,10 @@
 # Robert Readman <robert_readman at hotmail.com>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "synfig/language/en_GB/)\n"
@@ -37,8 +37,9 @@ msgstr "Text"
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "Other"
 
@@ -64,8 +65,9 @@ msgstr "Text to Render"
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "Colour"
 
@@ -83,7 +85,7 @@ msgstr "Style"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr "Normal"
 
@@ -96,7 +98,7 @@ msgid "Italic"
 msgstr "Italic"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr "Weight"
 
@@ -166,9 +168,12 @@ msgstr "Text Orientation"
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr "Origin"
 
@@ -202,7 +207,7 @@ msgstr "Turn this off if you are going to be animating the text"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr "Invert"
 
@@ -247,27 +252,27 @@ msgid "Type of blur to use"
 msgstr "Type of blur to use"
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr "Box Blur"
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr "Fast Gaussian Blur"
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr "Cross-Hatch Blur"
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr "Gaussian Blur"
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr "Disc Blur"
 
@@ -354,6 +359,7 @@ msgstr "Curve Warp"
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr "Distortions"
 
@@ -364,13 +370,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr "Width"
 
@@ -428,7 +435,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr "Filename seems to already be set to \"%s\" (%s)"
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr "Filename"
 
@@ -436,7 +443,8 @@ msgstr "Filename"
 msgid "File to import"
 msgstr "File to import"
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr "Time Offset"
 
@@ -603,7 +611,8 @@ msgstr "Offset Outside"
 msgid "Scale Outside"
 msgstr "Scale Outside"
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr "Rotate"
 
@@ -620,12 +629,13 @@ msgstr "Point where you want the origin to be"
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr "Amount"
 
@@ -647,7 +657,7 @@ msgid "Spherize"
 msgstr "Spherize"
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr "Position"
 
@@ -662,7 +672,7 @@ msgstr "Where the sphere distortion is centred"
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr "Radius"
 
@@ -766,12 +776,13 @@ msgstr "Be Alpha Safe"
 msgid "Avoid alpha artifacts when checked"
 msgstr "Avoid alpha artifacts when checked"
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr "Time Loop"
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr "Link Time"
 
@@ -779,16 +790,19 @@ msgstr "Link Time"
 msgid "Start time of the loop for the cycled context"
 msgstr "Start time of the loop for the cycled context"
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr "Local Time"
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr "The time when the resulted loop starts"
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr "Duration"
 
@@ -812,7 +826,8 @@ msgstr "Symmetrical"
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr "When checked, loops are mirrored centred on Local Time"
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr "Translate"
 
@@ -921,11 +936,12 @@ msgstr "Centre of the pattern"
 msgid "Size of the pattern"
 msgstr "Size of the pattern"
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr "Scale"
 
@@ -1015,13 +1031,14 @@ msgstr "Example"
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr "Fill colour of the layer"
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr "Point 1"
 
@@ -1033,6 +1050,7 @@ msgstr "First corner of the rectangle"
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr "Point 2"
 
@@ -1072,9 +1090,9 @@ msgstr "Metaballs"
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr "Gradient"
 
@@ -1138,7 +1156,7 @@ msgid "Blur"
 msgstr "Blur"
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr "Blurs"
 
@@ -1166,7 +1184,8 @@ msgstr "Contrast"
 msgid "Exposure Adjust"
 msgstr "Exposure Adjust"
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr "Gamma Adjustment"
 
@@ -1266,7 +1285,8 @@ msgstr "Advanced Outline"
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr "Geometry"
 
@@ -1312,37 +1332,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr "Rounded Stop"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr "Squared Stop"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr "Peak Stop"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr "Flat Stop"
 
@@ -1376,15 +1396,16 @@ msgid "Smoothness"
 msgstr "Smoothness"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+#, fuzzy
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 "Determines the interpolation between width points. (0) Linear (1) Smooth"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr "Homogeneous"
 
@@ -1452,7 +1473,8 @@ msgstr "Circle"
 msgid "Radius of the circle"
 msgstr "Radius of the circle"
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr "Feather"
 
@@ -1475,8 +1497,9 @@ msgstr "Determines the falloff function for the feather"
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr "Linear"
 
@@ -1495,7 +1518,7 @@ msgstr "Sigmond"
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr "Cosine"
 
@@ -1575,9 +1598,11 @@ msgstr "The radius of the inner points in the star"
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr "Angle"
 
@@ -1663,10 +1688,10 @@ msgstr "Global width of the gradient"
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr "Loop"
 
@@ -1809,32 +1834,32 @@ msgstr "Change to modify the random seed of the noise"
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr "Interpolation"
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr "What type of interpolation to use"
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr "Nearest Neighbor"
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr "Spline"
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr "Cubic"
 
@@ -1892,13 +1917,20 @@ msgid "When checked the gradient is supersampled"
 msgstr "When checked the gradient is supersampled"
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr "Link"
 
@@ -1920,6 +1952,7 @@ msgid "Seeds the random number generator"
 msgstr "Seeds the random number generator"
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr "Speed"
 
@@ -2008,8 +2041,9 @@ msgstr ""
 "If enabled, the alpha channel from the gradient is multiplied by the stem "
 "size, and an alpha of 1.0 is used when rendering"
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr "Reverse"
 
@@ -2017,8 +2051,9 @@ msgstr "Reverse"
 msgid "If enabled, render the plant in the opposite direction"
 msgstr "If enabled, render the plant in the opposite direction"
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr "Step"
 
@@ -2230,7 +2265,7 @@ msgstr "Importer::open(): Couldn't find extension"
 msgid "Importer::open(): Unknown file type -- "
 msgstr "Importer::open(): Unknown file type -- "
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr "Unable to create surface target"
 
@@ -2242,253 +2277,295 @@ msgstr "Z Depth"
 msgid "Modifies the position of the layer in the layer stack"
 msgstr "Modifies the position of the layer in the layer stack"
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr "Top-Left"
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr "Upper left-hand Corner of image"
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr "Bottom-Right"
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr "Lower right-hand Corner of image"
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr "Alpha channel of the layer"
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr "Blend Method"
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr "The blending method used to composite on the layers below"
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr "Duplicate"
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr "Index"
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr "Copy Index"
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr "[MIME]"
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr "Motion Blur"
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr "Aperture"
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr "Shutter Time"
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr "Subsamples Factor"
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr "Multiplies The Number Of Subsamples Rendered"
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr "Subsampling Type"
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr "Curve Type For Weighting Subsamples"
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr "Constant"
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr "Hyperbolic"
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr "Subsample Start Amount"
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr "Relative Amount Of The First Subsample, For Linear Weighting"
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr "Subsample End Amount"
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr "Relative Amount Of The Last Subsample, For Linear Weighting"
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr "Canvas"
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr "Time Offset to apply to the context"
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr "When checked prevents to select the children using the mouse click"
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr "Outline Grow"
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr "Exponential value to grow children Outline layers width"
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr "Current Time"
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr "Polygon"
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr "Vertices List"
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr "Define the corners of the polygon"
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr "Shape"
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr "Internal"
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr "Layer_Shape Colour"
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr "Antialiasing"
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr "Type of Feather"
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr "Type of feathering to use"
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr "Winding Style"
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr "Winding style to use"
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr "Non Zero"
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr "Even/Odd"
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr "Name"
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+#, fuzzy
+msgid "First corner of the bounds rectangle"
+msgstr "First corner of the rectangle"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+#, fuzzy
+msgid "Second corner of the bounds rectangle"
+msgstr "Second corner of the rectangle"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+#, fuzzy
+msgid "Horizontal subdivisions"
+msgstr "Horizontal Spacing"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr "Solid Colour"
 
-#: src/synfig/layer_sound.cpp:51
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
-msgstr "Rounded"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
-msgstr "Unable to open file"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr "Switch"
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2789,7 +2866,7 @@ msgstr "blank \"author\" entity"
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr "Canvas '%s' has undefined %s: %s"
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr "ValueNode"
 
@@ -2991,8 +3068,8 @@ msgstr "%s does not appear to be a valid %s palette file"
 msgid "%s does not appear to be a supported palette file"
 msgstr "%s does not appear to be a supported palette file"
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr "Composite"
 
@@ -3032,13 +3109,13 @@ msgstr "Multiply"
 msgid "Divide"
 msgstr "Divide"
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr "Add"
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr "Subtract"
 
@@ -3054,12 +3131,14 @@ msgstr "Brighten"
 msgid "Darken"
 msgstr "Darken"
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr "Hue"
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr "Saturation"
 
@@ -3175,230 +3254,260 @@ msgstr ""
 "Time(): No unit provided in time code and frame rate is unknown! Assuming "
 "SECONDS"
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr "Radial Composite"
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr "Reference"
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr "Segment Tangent"
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr "Segment Vertex"
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr "Stripes"
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr "Two-Tone"
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr "Dynamic List"
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr "Gradient Rotate"
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr "Sine"
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr "Timed Swap"
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr "Repeat Gradient"
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr "Exponential"
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr "Range"
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr "Cos"
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr "aTan2"
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr "Reverse Tangent"
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr "Reciprocal"
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr "Integer"
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr "Vector Angle"
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr "Vector Length"
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr "Vector X"
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr "Vector Y"
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr "Gradient Colour"
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr "Dot Product"
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr "Time String"
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr "Real"
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr "Real String"
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr "Joined List"
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr "Angle String"
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr "Int String"
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr "Logarithm"
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr "Greyed"
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr "Power"
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr "Compare"
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr "Not"
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr "And"
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr "Or"
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr "WPList"
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr "DIList"
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr "Bad type: ValueNode '%s' doesn't accept type '%s'"
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr "Placeholder"
 
@@ -3407,1266 +3516,1302 @@ msgstr "Placeholder"
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr "%s:%d wrong type for %s: need %s but got %s"
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ":Bad type "
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr "One or both of my parameters aren't set!"
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr "LHS"
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr "Left Hand Side of the addition"
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr "RHS"
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr "Right Hand Side of the addition"
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr "Scalar"
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr "Value that multiplies the addition"
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr "AND"
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr "Link1"
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr "First operand of the conjunction"
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr "Link2"
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr "Second operand of the conjunction"
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr "Value to convert to string"
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr "Width of the string"
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr "Precision"
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr "Number of decimal places"
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr "Zero Padded"
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr "When checked, the string is left filled with zeros to match the width"
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr "A waypoint already exists at this point in time"
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr "%s: You cannot use a %s in an animated ValueNode"
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr "Animated"
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr "X"
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr "No entries in list"
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr "No entries in ret_list"
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr "Vertex %03d"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr "When checked, the amount loops"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr "Offset"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr "Angle offset of the tangent"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr "Scale of the tangent"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr "Fixed Length"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr "When checked, the tangent's length is fixed"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr "Scale of the width"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr "The left hand side of the comparison"
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr "The right hand side of the comparison"
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr "Greater"
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr "When checked, returns true if LHS > RHS"
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr "Equal"
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr "When checked, returns true if LHS = RHS"
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr "Less"
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr "When checked, returns true if LHS < RHS"
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr "Bad type for composite"
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr "Red"
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr "The red component of the colour"
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr "Green"
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr "The green component of the colour"
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr "Blue"
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr "The blue component of the colour"
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr "Alpha"
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr "The alpha of the colour"
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr "Vertex 1"
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr "The first vertex of the segment"
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr "Tangent 1"
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr "The first tangent of the segment"
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr "Vertex 2"
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr "The second vertex of the segment"
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr "Tangent 2"
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr "The second tangent of the segment"
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr "X-Axis"
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr "The X-Axis component of the vector"
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr "Y-Axis"
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr "The Y-Axis component of the vector"
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr "Vertex"
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr "Defines the Off and On positions relative to neighbours"
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr "Split"
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr "When checked, tangents are independent"
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr "The width of the Width Point"
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr "Side Type Before"
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr "Defines the interpolation type of the width point"
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr "Interpolate"
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr "Side Type After"
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr "Lower Boundary"
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr "Upper Boundary"
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr "Length"
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr "The length of the Dash Item"
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr "Defines the side type of the dash item"
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr "Value"
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr "Value to calculate the cosine"
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr "Amplitude"
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr "Multiplier of the resulting cosine"
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr "From"
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr "Initial value of the index "
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr "To"
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr "Final value of the index"
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr "Amount increment of the index"
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr "List type/item type mismatch, throwing away mismatch"
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr "Item %03d"
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr "Exponent"
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr "The value to raise the constant 'e'"
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr "Multiplier of the resulting exponent"
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr "The source gradient to rotate"
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr "The amount to offset the gradient"
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr "The integer value to be converted"
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr "Strings"
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr "The List of strings to join"
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr "Before"
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr "The string to place before the joined strings"
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr "Separator"
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr "The string to place between each string joined"
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr "After"
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr "The string to place after the joined strings"
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr "Rate"
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr "Value that is multiplied by the current time (in seconds)"
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr "Slope"
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr "Returned value when the current time is zero"
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr "Epsilon"
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr "Infinite"
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr "Returned value when result tends to infinite"
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr "NOT"
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr "Value node to negate"
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr "OR"
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr "Value node used for the disjunction"
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr "Base"
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr "The base to be raised to the power"
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr "The power used to raise the base"
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr "Value used to compare base or power with zero "
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr "Bad type for radialcomposite"
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr "Luma"
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr "The length of the vector"
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr "Theta"
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr "The angle of the vector with the X axis"
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr "Some of my parameters aren't set!"
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr "Min"
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr "Returned value when 'Link' is smaller"
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr "Max"
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr "Returned value when 'Link' is greater"
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr "The value node to limit its range"
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr "The value node used to calculate its reciprocal"
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr "The resulting value when 'Link' < 'Epsilon'"
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr "The referenced value"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr "The source gradient to repeat"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr "Count"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr "The number of repetition of the gradient"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr "Specify Start"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 "When checked, 'Start Colour' is used as the start of the resulting gradient"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr "Specify End"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 "When checked, 'End Colour' is used as the start of the resulting gradient"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr "Start Colour"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr "Used as the start of the resulting gradient"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr "End Colour"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr "Used as the end of the resulting gradient"
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+#, fuzzy
+msgid "The value to be reversed"
+msgstr "The integer value to be converted"
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr "Attempting to get the inverse of a non invertible Valuenode"
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr "The value node used to scale"
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr "Value that multiplies the value node"
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr "Segment"
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr "The Segment the tangent is linked to"
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr "The position of the linked tangent on the Segment (0,1]"
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr "The Segment the vertex is linked to"
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr "The position of the linked vertex on the Segment (0,1]"
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr "The angle the sine is calculated from"
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr "The value that multiplies the resulting sine"
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr "The value node used to make the step"
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr "The duration of the step"
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr "Start Time"
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr "The time when the step conversion starts"
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr "Intersection"
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr "Colour 1"
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr "One colour of the gradient stripes"
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr "Colour 2"
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr "Other colour of the gradient stripes"
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr "Stripe Count"
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr "Number of stripes in the gradient"
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr "Width of stripes in the gradient between [0,1]"
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr "Left Hand Side of the subtraction"
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr "Right Hand Side of the subtraction"
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr "Value that multiplies the subtraction"
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr "Link Off"
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr "The value node returned when the switch is off"
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr "Link On"
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr "The value node returned when the switch is on"
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr "When checked, returns 'Link On', otherwise returns 'Link Off'"
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr "The value node returned when current time is before 'time' - 'length'"
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr "The value node returned when current time is after 'time'"
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr "Time"
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr "The time when the linear interpolation ends"
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
@@ -4674,57 +4819,58 @@ msgstr ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr "The value node to time loop"
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr "The time that is converted to string"
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr "The start colour of the gradient"
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr "The end colour of the gradient"
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr "Vector"
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr "The vector the angle is calculated from"
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr "The vector the length is calculated from"
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr "The vector the X coordinate is extracted from"
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr "The vector the Y coordinate is extracted from"
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr "WidthPoint %03d"
diff --git a/po/es.gmo b/po/es.gmo
index 50bfa2e..278f7dd 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index 1b27f66..7d52067 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,10 +11,10 @@
 # morevnaproject <ksee.zelgadis at gmail.com>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/synfig/language/"
 "es/)\n"
@@ -33,8 +33,9 @@ msgstr "Texto"
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "Otro"
 
@@ -60,8 +61,9 @@ msgstr "Texto para Renderizar"
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "Color"
 
@@ -79,7 +81,7 @@ msgstr "Estilo"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr "Normal"
 
@@ -92,7 +94,7 @@ msgid "Italic"
 msgstr "Cursiva"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr "Peso"
 
@@ -162,9 +164,12 @@ msgstr "Orientación del texto"
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr "Origen"
 
@@ -198,7 +203,7 @@ msgstr "Desmarque esto si va a animar el texto"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr "Invertir"
 
@@ -245,27 +250,27 @@ msgid "Type of blur to use"
 msgstr "Tipo de desenfoque a usar"
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr "Desenfoque \"Box\""
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr "Desenfoque Gaussiano rápido"
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr "Desenfoque Mallado"
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr "Desenfoque Gaussiano"
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr "Desenfoque Disco"
 
@@ -352,6 +357,7 @@ msgstr "Combar por Curva"
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr "Distorsiones"
 
@@ -362,13 +368,14 @@ msgstr "Posición del spline destino"
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr "Espesor"
 
@@ -427,7 +434,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr "Parece que el archivo ya ha sido llamado \"%s\" (%s)"
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr "Nombre del Archivo"
 
@@ -435,7 +442,8 @@ msgstr "Nombre del Archivo"
 msgid "File to import"
 msgstr "Archivo a importar"
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr "Desfase de Tiempo"
 
@@ -602,7 +610,8 @@ msgstr "Desplazamiento Exterior"
 msgid "Scale Outside"
 msgstr "Escala Exterior"
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr "Rotar"
 
@@ -619,12 +628,13 @@ msgstr "Apunta donde usted quiera que esté el origen"
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr "Cantidad"
 
@@ -646,7 +656,7 @@ msgid "Spherize"
 msgstr "Esferizar"
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr "Posición"
 
@@ -661,7 +671,7 @@ msgstr "Donde se centra la distorsión esférica"
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr "Radio"
 
@@ -765,12 +775,13 @@ msgstr "Estar a salvo de Transparencia"
 msgid "Avoid alpha artifacts when checked"
 msgstr "Evita artefactos alfa cuando está marcado"
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr "Bucle de Tiempo"
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr "Tiempo del Enlace"
 
@@ -778,16 +789,19 @@ msgstr "Tiempo del Enlace"
 msgid "Start time of the loop for the cycled context"
 msgstr "Tiempo de inicio del bucle para el contexto sobre el que se aplica"
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr "Tiempo Local"
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr "El momento en que el bucle se inicia"
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr "Duración"
 
@@ -811,7 +825,8 @@ msgstr "Simétrico"
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr "Cuando está marcado, los bucles se reflejan centrados en Tiempo Local"
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr "Trasladar"
 
@@ -920,11 +935,12 @@ msgstr "Centro del patrón"
 msgid "Size of the pattern"
 msgstr "Tamaño del patrón"
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr "Escala"
 
@@ -1014,13 +1030,14 @@ msgstr "Ejemplo"
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr "Color de relleno de la capa"
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr "Punto 1"
 
@@ -1032,6 +1049,7 @@ msgstr "Primera esquina del rectángulo"
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr "Punto 2"
 
@@ -1071,9 +1089,9 @@ msgstr "Metaballs"
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr "Gradiente"
 
@@ -1137,7 +1155,7 @@ msgid "Blur"
 msgstr "Desenfoque"
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr "Desenfoques"
 
@@ -1165,7 +1183,8 @@ msgstr "Contraste"
 msgid "Exposure Adjust"
 msgstr "Ajuste de Exposición"
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr "Ajuste de Gamma"
 
@@ -1265,7 +1284,8 @@ msgstr "Contorno Avanzado"
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr "Geometría"
 
@@ -1312,37 +1332,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr "Parada Redondeada"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr "Parada Cuadrada"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr "Parada en Punta"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr "Parada Plana"
 
@@ -1377,14 +1397,15 @@ msgid "Smoothness"
 msgstr "Suavidad"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+#, fuzzy
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr "Determina la interpolación entre withpoints. (0) Lineal (1) Suave"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr "Homogeneo"
 
@@ -1455,7 +1476,8 @@ msgstr "Círculo"
 msgid "Radius of the circle"
 msgstr "Radio del círculo"
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr "Desvanecimiento"
 
@@ -1478,8 +1500,9 @@ msgstr "Determina la función de caída del desvanecimiento"
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr "Linear"
 
@@ -1498,7 +1521,7 @@ msgstr "Sigmoidea"
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr "Coseno"
 
@@ -1579,9 +1602,11 @@ msgstr "El radio de los puntos interiores de la estrella"
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr "Ángulo"
 
@@ -1667,10 +1692,10 @@ msgstr "Ancho global del gradiente"
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr "Bucle"
 
@@ -1813,32 +1838,32 @@ msgstr "Cambiar para modificar la semilla aleatoria del ruido"
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr "Interpolación"
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr "Que tipo de interpolación usar"
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr "Vecino más cercano"
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr "Spline"
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr "Cúbico"
 
@@ -1896,13 +1921,20 @@ msgid "When checked the gradient is supersampled"
 msgstr "Cuando está marcado el gradiente es supermuestreado"
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr "Enlace"
 
@@ -1924,6 +1956,7 @@ msgid "Seeds the random number generator"
 msgstr "Origina el generador de números aleatorios"
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr "Velocidad"
 
@@ -2018,8 +2051,9 @@ msgstr ""
 "el tamaño de tallo y un valor de transparencia de 1,0 se usa al mostrar el "
 "gradiente"
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr "Inversa"
 
@@ -2027,8 +2061,9 @@ msgstr "Inversa"
 msgid "If enabled, render the plant in the opposite direction"
 msgstr "Si se habilita, la planta se muestra en la dirección opuesta"
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr "Paso"
 
@@ -2242,7 +2277,7 @@ msgstr "Importer::open(): No puede econtrar la extensión"
 msgid "Importer::open(): Unknown file type -- "
 msgstr "Importer::open(): Tipo de archivo desconocido -- "
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr "Imposible crear superficie objetivo"
 
@@ -2254,256 +2289,298 @@ msgstr "Profundidad Z"
 msgid "Modifies the position of the layer in the layer stack"
 msgstr "Modifica la posición de la capa en la pila de capas"
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr "Arriba-Izquierda"
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr "Esquina superior izquierda de la imagen"
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr "Abajo-Derecha"
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr "Esquina inferior derecha de la imagen"
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr "Canal alfa de la capa"
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr "Método de Mezcla"
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 "El método de mezcla utilizado para componerse sobre las capas inferiores"
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr "Duplicar"
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr "Índice"
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr "Copiar Índice"
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr "[MIME]"
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr "Desenfoque de Movimiento"
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr "Apertura"
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr "Tiempo de disparo"
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr "Factor de Submuestreo"
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr "Multiplica el Número de Submuestreos en el Renderizado"
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr "Tipo de Submuestreo"
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr "Tipo de Curva para el Ponderar el Submuestreo"
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr "Constante"
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr "Hiperbólico"
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr "Cantidad de Inicio del Submuestreo"
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr "Cantidad Relativa del Primer Submuestreo Para Ponderación Lineal"
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr "Cantidad Final del Submuestreo"
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr "Cantidad Relativa del Último Submuestreo Para Ponderación Lineal"
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr "Lienzo"
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr "Contenido del grupo"
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr "Desplazamiento de tiempo para aplicar al contexto"
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 "Cuando está marcado evita seleccionar a las capas descendientes mediante el "
 "clic del ratón"
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr "Crecimiento de espesor"
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr "Valor exponencial para crecer el espesor de las capas Contorno hijas"
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr "Tiempo Actual"
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr "Polígono"
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr "Lista de Vértices"
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr "Define las esquinas del polígono"
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr "Forma"
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr "Interno"
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr "Color de la Capa de Forma"
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr "Antialiasing"
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr "Tipo de Desvanecimiento"
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr "Tipo de desvanecimiento a usar"
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr "Estilo de Solape"
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr "Estilo de solape a usar"
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr "No Cero"
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr "Par/Impar"
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr "Nombre"
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+#, fuzzy
+msgid "First corner of the bounds rectangle"
+msgstr "Primera esquina del rectángulo"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+#, fuzzy
+msgid "Second corner of the bounds rectangle"
+msgstr "Segunda esquina del rectángulo"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+#, fuzzy
+msgid "Horizontal subdivisions"
+msgstr "Espaciado Horizontal"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr "Color Sólido"
 
-#: src/synfig/layer_sound.cpp:51
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
-msgstr "Redondeada"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
-msgstr "Imposible abrir archivo"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr "Interruptor"
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2807,7 +2884,7 @@ msgstr "entidad \"author\" vacía"
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr "Lienzo '%s' tiene sin definir '%s':'%s'"
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr "Valor de Nodo"
 
@@ -3009,8 +3086,8 @@ msgstr "%s no parece ser un archivo de paleta %s válido"
 msgid "%s does not appear to be a supported palette file"
 msgstr "%s no parece ser un archivo de paleta soportado"
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr "Componer"
 
@@ -3050,13 +3127,13 @@ msgstr "Multiplicar"
 msgid "Divide"
 msgstr "Dividir"
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr "Sumar"
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr "Restar"
 
@@ -3072,12 +3149,14 @@ msgstr "Clarear"
 msgid "Darken"
 msgstr "Oscurecer"
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr "Tono"
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr "Saturación"
 
@@ -3195,230 +3274,260 @@ msgstr ""
 "Time(): ¡Unidad de tiempo no proporcionada y el ratio de fotogramas es "
 "desconocido! Asumiendo SEGUNDOS"
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr "Composición Radial"
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr "Referencia"
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr "Tangente de Segmento"
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr "Vértice de Segmento"
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr "Bandas"
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr "Dos Tonos"
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr "Lista Dinámica"
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr "Rotar Gradiente"
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr "Seno"
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr "Intercambio Temporizado"
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr "Repetir Gradiente"
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr "Exponencial"
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr "Tangente de Spline"
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr "Vértice de Spline"
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr "Rango"
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr "Coseno"
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr "aTan2"
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr "Revertir Tangente"
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr "Recíproco"
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr "Entero"
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr "Espesor de Contorno"
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr "Ángulo de Vector"
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr "Longitud de Vector"
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr "X de Vector"
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr "Y de Vector"
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr "Gradiente de color"
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr "Producto Escalar"
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr "Cadena de Tiempo"
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr "Real"
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr "Cadena de Real"
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr "Lista Unida"
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr "Cadena de Ángulo"
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr "Cadena de Entero"
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr "Logaritmo"
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr "Inalterable"
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr "Potencia"
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr "Comparar"
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr "Negado"
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr "Y"
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr "O"
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr "Influencia de Hueso"
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr "Hueso"
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr "Hueso Raíz"
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr "Lista Estática"
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr "Par Hueso-Peso"
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr "Lista de Espesores"
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr "Lista de Elementos Guión"
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr "Mal tipo: Valor de Nodo %s no acepta el tipo %s"
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr "Casilla"
 
@@ -3427,1280 +3536,1316 @@ msgstr "Casilla"
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr "%s:%d mal tipo para %s: necesito %s pero obtengo %s"
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr "Mal tipo "
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr "Uno o ambos de mis parámetros no están establecidos!"
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr "LHS"
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr "Parte izquierda de la suma"
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr "RHS"
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr "Parte derecha de la suma"
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr "Escalar"
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr "Valor que se multiplica la suma"
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr "Y"
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr "Enlace1"
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr "El primer operando de la operación Y"
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr "Enlace2"
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr "El segundo operando de la operación Y"
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr "Valor para convertir a cadena"
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr "Ancho de la cadena"
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr "Precisión"
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr "Número de decimales"
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr "Relleno con Ceros"
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 "Cuando está marcado, la cadena se rellena con ceros a la izquierda para que "
 "coincida con el ancho"
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr "Un punto de interpolación existe actualmente en este punto de tiempo"
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr "%s: No puede usar %s en un Valor de Nodo animado"
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr "Animado"
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr "X"
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr "Sin entradas en la lista"
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr "Sin entradas en ret_list"
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr "Vértice %03d"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr "El spline donde la tangente esta enlazada"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr "Cuando está marcado, la posición de enlace hace bucle"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr "La posición de la tangente enlazada al spline (0,1]"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr "Desplazamiento"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr "Ángulo de desplazamiento de la tangente"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr "Escala de la tangente"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr "Longitud Fija"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr "Cuando está marcado, la longitud de la tangente es fija"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr "Cuando se marca, la tangente se basa en la longitud del spline"
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr "El spline a la que está enlazado el vértice"
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr "La posición del vértice enlazado en el spline (0,1]"
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr "Cuando se marca, la posición se basa en la longitud del spline"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr "El spline donde el espesor esta enlazado"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr "La posición del espesor enlazado en el spline (0,1]"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr "Escala del espesor"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr "Cuando se marca, el espesor se basa en la longitud del spline"
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr "El lado izquierdo de la comparación"
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr "El lado derecho de la comparación"
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr "Mayor"
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr "Cuando está marcado, devuelve verdadero si LHS > RHS"
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr "Igual"
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr "Cuando está marcado, devuelve verdadero si LHS = RHS"
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr "Menor"
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr "Cuando está marcado, devuelve verdadero si LHS < RHS"
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr "Mal tipo para componer"
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr "Rojo"
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr "El componente rojo del color"
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr "Verde"
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr "El componente verde del color"
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr "Azul"
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr "El componente azul del color"
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr "Alfa"
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr "El alfa del color"
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr "Vértice 1"
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr "El primer vértice del segmento"
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr "Tangente 1"
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr "La primera tangente del segmento"
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr "Vértice 2"
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr "El segundo vértice del segmento"
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr "Tangente 2"
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr "La segunda tangente del segmento"
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr "El eje X"
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr "La componente X del vector"
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr "El eje Y"
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr "La componente Y del vector"
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr "Vértice"
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr "El vértice del punto de spline"
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr "El espesor del punto de spline"
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 "Define la posición de apagado y encendido en relación con los puntos vecinos"
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr "Separar"
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr "Cuando está marcado, las tangentes son independientes"
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr "La primera tangente del punto de spline"
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr "La segunda tangente del punto de spline"
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr "La posición [0,1] del Punto de Espesor sobre el spline"
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr "El espesor del Punto de Espesor"
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr "Tipo de Lado anterior"
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr "Define el tipo de interpolación del punto de espesor"
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr "Interpolar"
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr "Tipo de Lado posterior"
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr "Límite inferior"
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr "Define la posición al comienzo del Spline"
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr "Límite Superior"
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr "Define la posición al final del Spline"
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 "El desplazamiento del elemento guión respecto al anterior sobre el Spline"
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr "Longitud"
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr "La longitud del elemento guión"
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr "Define el tipo de lado para el elemento guión"
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr "Valor"
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr "Valor para calcular el coseno"
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr "Amplitud"
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr "Multiplicador del coseno resultante"
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr "Desde"
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr "Valor inicial del índice"
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr "Hasta"
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr "Valor final del índice"
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr "Cantidad de incremento del índice"
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 "Tipo de lista/tipo de elemento mal emparejado, descartando el "
 "desemparejamiento "
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr "Elemento %03d"
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr "Exponente"
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr "El valor para aumentar la constante \"e\""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr "Multiplicador del exponente resultante"
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr "El gradiente fuente para rotar"
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr "La cantidad para desplazar el gradiente"
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr "El valor entero a convertir"
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr "Cadenas"
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr "La lista de cadenas para unir"
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr "Antes"
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr "La cadena a colocar previo a las cadenas unidas"
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr "Separador"
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr "La cadena a colocar entre las cadenas unidas"
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr "Después"
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr "La cadena a colocar tras las cadenas unidas"
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr "Ratio"
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr "Valor que se multiplica por el tiempo actual (en segundos)"
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr "Pendiente"
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr "El valor devuelto cuando el tiempo actual es cero"
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr "Epsilon"
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr "Infinito"
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr "Valor devuelto cuando el resultado tiende a infinito"
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr "NEGADO"
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr "Valor del nodo utilizado para hacer la operación NO"
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr "O"
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr "Valor de nodo utilizado para la operación booleana OR"
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr "Base"
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr "La base para ser elevada al exponente"
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr "El exponente para elevar la base"
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr "Valor que se utiliza para comparar la base o el exponente con cero"
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr "Mal tipo para composición radial"
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr "Luma"
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr "La longitud del vector"
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr "Theta"
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr "El ángulo del vector con el eje X"
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr "¡Algunos de mis parámetros no han sido establecidos!"
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr "Min"
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr "El valor devuelto cuando el 'Link' es menor"
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr "Max"
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr "El valor devuelto cuando 'Link' es mayor"
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr "El valor del nodo para limitar su rango"
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr "El valor real a ser convertido"
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr "El valor del nodo utilizado para calcular su recíproco"
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 "El valor que se utiliza para decidir si el Enlace es demasiado pequeño como "
 "para obtener su recíproco"
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr "El valor resultante cuando 'Enlace' < 'Epsilon'"
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr "El valor referenciado"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr "El gradiente a repetir"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr "Contador"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr "El número de repeticiones del gradiente"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr "Especificar Comienzo"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 "Cuando está marcado, 'Inicio en color' se utiliza como el inicio del "
 "gradiente resultante"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr "Especificar Fin"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 "Cuando está marcado, 'Fin de color' se utiliza como el inicio del gradiente "
 "resultante"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr "Color de Comienzo"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr "Se utiliza como el inicio del gradiente resultante"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr "Color de Fin"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr "Se utiliza como el final del gradiente resultante"
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+#, fuzzy
+msgid "The value to be reversed"
+msgstr "El valor real a ser convertido"
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr "Intentando obtener la inversa de un Valor de Nodo no invertible"
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr "El valor del nodo que usado para escalar"
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr "Valor que multiplica el nodo de valor"
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr "Segmento"
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr "El segmento donde se enlaza la tangente"
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr "La posición de la tangente enlazada al segmento (0,1]"
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr "El segmento donde se enlaza el vértice"
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr "La posición del vértice enlazado en el segmento (0,1]"
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr "El ángulo sobre el que se calcula el seno"
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr "El valor que se multiplica el seno resultante"
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr "El valor del nodo utilizado para obtener el escalón"
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr "La duración del escalón"
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr "Tiempo de Inicio"
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr "El tiempo en el que la conversión de escalón se inicia"
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr "Intersección"
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr "Valor que definine si el paso es centrado sobre el valor [0,1]"
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr "Color 1"
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr "Un color de las bandas del gradiente"
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr "Color 2"
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr "El otro color de las bandas del gradiente"
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr "Contador de Bandas"
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr "Número de bandas en el gradiente"
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr "Anchura de las bandas del gradiente entre [0,1]"
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr "Lado izquierdo de la resta"
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr "Lado derecho de la resta"
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr "Valor por el que se multiplica la resta"
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr "Enlace apagado"
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr "El valor de nodo devuelto cuando el interruptor está apagado"
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr "Enlace encendido"
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr "El valor de nodo devuelto cuando el interruptor está encendido"
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 "Cuando está marcado, devuelve el Enlace encendido, de lo contrario devuelve "
 "el Enlace apagado"
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 "El valor de nodo devuelto cuando el tiempo actual es anterior a \"tiempo\" - "
 "\"longitud\""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 "El valor de nodo devuelto cuando el tiempo actual es después de \"tiempo\""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr "Tiempo"
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr "El tiempo en el que la interpolación lineal finaliza"
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
@@ -4708,57 +4853,58 @@ msgstr ""
 "La longitud del tiempo en el que la interpolación lineal entre 'Antes' y "
 "'Después' se hace"
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr "El valor de nodo para hacer bucle de tiempo"
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr "El tiempo que se convierte en cadena"
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr "Color de inicio del gradiente"
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr "Color final del gradiente"
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr "Vector"
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr "El vector sobre el que se calcula el ángulo"
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr "El vector sobre el que se calcula la longitud"
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr "El vector sobre el que se extrae la coordenada X"
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr "El vector sobre el que se extrae la coordenada Y"
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr "Punto de Espesor %03d"
diff --git a/po/eu.gmo b/po/eu.gmo
index 482d413..d0c82f9 100644
Binary files a/po/eu.gmo and b/po/eu.gmo differ
diff --git a/po/eu.po b/po/eu.po
index 5f1abb0..85d700e 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -6,10 +6,10 @@
 # Alexander Gabilondo <alexgabi at openmailbox.org>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/synfig/language/"
 "eu/)\n"
@@ -28,8 +28,9 @@ msgstr ""
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "Beste bat"
 
@@ -55,8 +56,9 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "Kolorea"
 
@@ -74,7 +76,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr ""
 
@@ -87,7 +89,7 @@ msgid "Italic"
 msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr ""
 
@@ -157,9 +159,12 @@ msgstr ""
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr "Jatorria"
 
@@ -193,7 +198,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr "Alderantzizkatu"
 
@@ -238,27 +243,27 @@ msgid "Type of blur to use"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr ""
 
@@ -345,6 +350,7 @@ msgstr ""
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr ""
 
@@ -355,13 +361,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr ""
 
@@ -419,7 +426,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr ""
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr ""
 
@@ -427,7 +434,8 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr ""
 
@@ -594,7 +602,8 @@ msgstr ""
 msgid "Scale Outside"
 msgstr ""
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr ""
 
@@ -611,12 +620,13 @@ msgstr ""
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr "Kopurua"
 
@@ -638,7 +648,7 @@ msgid "Spherize"
 msgstr ""
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr ""
 
@@ -653,7 +663,7 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr "Erradioa"
 
@@ -757,12 +767,13 @@ msgstr ""
 msgid "Avoid alpha artifacts when checked"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr ""
 
@@ -770,16 +781,19 @@ msgstr ""
 msgid "Start time of the loop for the cycled context"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr ""
 
@@ -803,7 +817,8 @@ msgstr ""
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr ""
 
@@ -912,11 +927,12 @@ msgstr ""
 msgid "Size of the pattern"
 msgstr ""
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr ""
 
@@ -1006,13 +1022,14 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr ""
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr ""
 
@@ -1024,6 +1041,7 @@ msgstr ""
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr ""
 
@@ -1063,9 +1081,9 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr "Gradientea"
 
@@ -1129,7 +1147,7 @@ msgid "Blur"
 msgstr ""
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr ""
 
@@ -1157,7 +1175,8 @@ msgstr ""
 msgid "Exposure Adjust"
 msgstr ""
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr ""
 
@@ -1257,7 +1276,8 @@ msgstr ""
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr ""
 
@@ -1303,37 +1323,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr ""
 
@@ -1367,14 +1387,14 @@ msgid "Smoothness"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr ""
 
@@ -1442,7 +1462,8 @@ msgstr ""
 msgid "Radius of the circle"
 msgstr ""
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr "Difuminatu"
 
@@ -1465,8 +1486,9 @@ msgstr "Zehaztu erorketa-funtzioa difuminatuarentzat"
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr "Lineala"
 
@@ -1485,7 +1507,7 @@ msgstr "Sigmond"
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr "kosinu"
 
@@ -1565,9 +1587,11 @@ msgstr ""
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr "Angelua"
 
@@ -1653,10 +1677,10 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr ""
 
@@ -1799,32 +1823,32 @@ msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr "Interpolazioa"
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr ""
 
@@ -1882,13 +1906,20 @@ msgid "When checked the gradient is supersampled"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr "Estela"
 
@@ -1910,6 +1941,7 @@ msgid "Seeds the random number generator"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr ""
 
@@ -1994,8 +2026,9 @@ msgid ""
 "size, and an alpha of 1.0 is used when rendering"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr ""
 
@@ -2003,8 +2036,9 @@ msgstr ""
 msgid "If enabled, render the plant in the opposite direction"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr ""
 
@@ -2215,7 +2249,7 @@ msgstr ""
 msgid "Importer::open(): Unknown file type -- "
 msgstr ""
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr ""
 
@@ -2227,252 +2261,292 @@ msgstr "Z sakonera"
 msgid "Modifies the position of the layer in the layer stack"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr "Nahasketa-metodoa"
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr "Bikoiztu"
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr ""
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr "Konstantea"
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr "Oihala"
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr "Izena"
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+msgid "First corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+msgid "Second corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+msgid "Horizontal subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:51
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
-msgstr "Ezin da fitxategia ireki"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2768,7 +2842,7 @@ msgstr ""
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr ""
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr "ValueNode"
 
@@ -2970,8 +3044,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr ""
 
@@ -3011,13 +3085,13 @@ msgstr ""
 msgid "Divide"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr ""
 
@@ -3033,12 +3107,14 @@ msgstr ""
 msgid "Darken"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr "Ñabardura"
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr "Saturazioa"
 
@@ -3152,230 +3228,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr "Erreferentzia"
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr "Osokoa"
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr "Erreala"
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr ""
 
@@ -3384,1319 +3490,1355 @@ msgstr ""
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr "X"
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr "Gorria"
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr "Berdea"
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr "Urdina"
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr "Alfa"
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr "Luzera"
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr "Balioa"
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr "Luminantzia"
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+msgid "The value to be reversed"
+msgstr ""
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr "Segmentoa"
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr "Denbora"
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr "Bektorea"
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/eu_ES.gmo b/po/eu_ES.gmo
index 15c34a3..3c06fed 100644
Binary files a/po/eu_ES.gmo and b/po/eu_ES.gmo differ
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 6ad8162..5e505b2 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,10 +6,10 @@
 # Alexander Gabilondo <alexgabi at openmailbox.org>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/synfig/"
 "language/eu_ES/)\n"
@@ -28,8 +28,9 @@ msgstr ""
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "Beste bat"
 
@@ -55,8 +56,9 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "Kolorea"
 
@@ -74,7 +76,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr ""
 
@@ -87,7 +89,7 @@ msgid "Italic"
 msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr ""
 
@@ -157,9 +159,12 @@ msgstr ""
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr "Jatorria"
 
@@ -193,7 +198,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr "Alderantzizkatu"
 
@@ -238,27 +243,27 @@ msgid "Type of blur to use"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr ""
 
@@ -345,6 +350,7 @@ msgstr ""
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr ""
 
@@ -355,13 +361,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr ""
 
@@ -419,7 +426,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr ""
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr ""
 
@@ -427,7 +434,8 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr ""
 
@@ -594,7 +602,8 @@ msgstr ""
 msgid "Scale Outside"
 msgstr ""
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr ""
 
@@ -611,12 +620,13 @@ msgstr ""
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr "Kopurua"
 
@@ -638,7 +648,7 @@ msgid "Spherize"
 msgstr ""
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr ""
 
@@ -653,7 +663,7 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr "Erradioa"
 
@@ -757,12 +767,13 @@ msgstr ""
 msgid "Avoid alpha artifacts when checked"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr ""
 
@@ -770,16 +781,19 @@ msgstr ""
 msgid "Start time of the loop for the cycled context"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr ""
 
@@ -803,7 +817,8 @@ msgstr ""
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr ""
 
@@ -912,11 +927,12 @@ msgstr ""
 msgid "Size of the pattern"
 msgstr ""
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr ""
 
@@ -1006,13 +1022,14 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr ""
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr ""
 
@@ -1024,6 +1041,7 @@ msgstr ""
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr ""
 
@@ -1063,9 +1081,9 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr "Gradientea"
 
@@ -1129,7 +1147,7 @@ msgid "Blur"
 msgstr ""
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr ""
 
@@ -1157,7 +1175,8 @@ msgstr ""
 msgid "Exposure Adjust"
 msgstr ""
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr ""
 
@@ -1257,7 +1276,8 @@ msgstr ""
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr ""
 
@@ -1303,37 +1323,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr ""
 
@@ -1367,14 +1387,14 @@ msgid "Smoothness"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr ""
 
@@ -1442,7 +1462,8 @@ msgstr ""
 msgid "Radius of the circle"
 msgstr ""
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr "Difuminatu"
 
@@ -1465,8 +1486,9 @@ msgstr "Zehaztu erorketa-funtzioa difuminatuarentzat"
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr "Lineala"
 
@@ -1485,7 +1507,7 @@ msgstr "Sigmond"
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr "kosinu"
 
@@ -1565,9 +1587,11 @@ msgstr ""
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr "Angelua"
 
@@ -1653,10 +1677,10 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr ""
 
@@ -1799,32 +1823,32 @@ msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr "Interpolazioa"
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr ""
 
@@ -1882,13 +1906,20 @@ msgid "When checked the gradient is supersampled"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr "Estela"
 
@@ -1910,6 +1941,7 @@ msgid "Seeds the random number generator"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr ""
 
@@ -1994,8 +2026,9 @@ msgid ""
 "size, and an alpha of 1.0 is used when rendering"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr ""
 
@@ -2003,8 +2036,9 @@ msgstr ""
 msgid "If enabled, render the plant in the opposite direction"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr ""
 
@@ -2215,7 +2249,7 @@ msgstr ""
 msgid "Importer::open(): Unknown file type -- "
 msgstr ""
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr ""
 
@@ -2227,252 +2261,292 @@ msgstr "Z sakonera"
 msgid "Modifies the position of the layer in the layer stack"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr "Nahasketa-metodoa"
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr "Bikoiztu"
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr ""
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr "Konstantea"
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr "Oihala"
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr "Izena"
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+msgid "First corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+msgid "Second corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+msgid "Horizontal subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:51
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
-msgstr "Ezin da fitxategia ireki"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2768,7 +2842,7 @@ msgstr ""
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr ""
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr "ValueNode"
 
@@ -2970,8 +3044,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr ""
 
@@ -3011,13 +3085,13 @@ msgstr ""
 msgid "Divide"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr ""
 
@@ -3033,12 +3107,14 @@ msgstr ""
 msgid "Darken"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr "Ñabardura"
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr "Saturazioa"
 
@@ -3152,230 +3228,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr "Erreferentzia"
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr "Osokoa"
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr "Erreala"
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr ""
 
@@ -3384,1319 +3490,1355 @@ msgstr ""
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr "X"
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr "Gorria"
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr "Berdea"
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr "Urdina"
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr "Alfa"
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr "Luzera"
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr "Balioa"
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr "Luminantzia"
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+msgid "The value to be reversed"
+msgstr ""
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr "Segmentoa"
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr "Denbora"
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr "Bektorea"
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/fa_IR.gmo b/po/fa_IR.gmo
index a815aae..8c134c0 100644
Binary files a/po/fa_IR.gmo and b/po/fa_IR.gmo differ
diff --git a/po/fa_IR.po b/po/fa_IR.po
index 4138e4b..accf455 100644
--- a/po/fa_IR.po
+++ b/po/fa_IR.po
@@ -6,10 +6,10 @@
 # Hadi Fadakar <h_adi_f at yahoo.com>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/synfig/"
 "language/fa_IR/)\n"
@@ -28,8 +28,9 @@ msgstr "متن"
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "سایر"
 
@@ -55,8 +56,9 @@ msgstr "متن  به بارگزاری صفحه"
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "رنگ"
 
@@ -74,7 +76,7 @@ msgstr "سبک"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr "عادی"
 
@@ -87,7 +89,7 @@ msgid "Italic"
 msgstr "کج"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr "وزن"
 
@@ -157,9 +159,12 @@ msgstr "جهت متن"
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr "منشاء"
 
@@ -193,7 +198,7 @@ msgstr "اگر می خواهید متن را پویانمایی کنید این
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr "معکوس"
 
@@ -238,27 +243,27 @@ msgid "Type of blur to use"
 msgstr "نوع تیرگی برای استفاده"
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr "تاری جعبه ای "
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr "تاری گاوسی سریع "
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr "تاری کراس هچ "
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr "تاری گاوسی "
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr "تاری دیسک "
 
@@ -345,6 +350,7 @@ msgstr "پیچاندن منحنی"
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr "انحراف ها"
 
@@ -355,13 +361,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr "عرض"
 
@@ -419,7 +426,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr "به نظر می آید نام فایل قبلا به %s(%s) قرار داده شده است"
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr "نام فایل"
 
@@ -427,7 +434,8 @@ msgstr "نام فایل"
 msgid "File to import"
 msgstr "فایل برای وارد کردن"
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr "زمان افست"
 
@@ -594,7 +602,8 @@ msgstr "انحراف در خارج"
 msgid "Scale Outside"
 msgstr "مقیاس خارج"
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr "چرخاندن"
 
@@ -611,12 +620,13 @@ msgstr "نقطه ای که شما می خواهید به منشاء شود را
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr "مقدار"
 
@@ -638,7 +648,7 @@ msgid "Spherize"
 msgstr "کره ای شدن"
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr "موقعیت"
 
@@ -653,7 +663,7 @@ msgstr "جایی انحراف گردی متمرکز می شود "
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr "شعاع"
 
@@ -757,12 +767,13 @@ msgstr "آلفا ایمن باش"
 msgid "Avoid alpha artifacts when checked"
 msgstr "اجتناب از آثار  آلفا هنگامی که علامت خورده باشد"
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr "حلقه ی زمان"
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr "پیوند زمان"
 
@@ -770,16 +781,19 @@ msgstr "پیوند زمان"
 msgid "Start time of the loop for the cycled context"
 msgstr "زمان شروع حلقه برای چرخه ی بافت "
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr "وقت محلی"
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr "زمانی که حلقه ی تنتیجه شروع می شود"
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr "مدت"
 
@@ -803,7 +817,8 @@ msgstr "به صورت متقارن"
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr "اگر علامت خورده باشد، حلقه ها در وقت محلی در مرکز آینه می شوند"
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr "ترجمه"
 
@@ -912,11 +927,12 @@ msgstr "مرکز الگو"
 msgid "Size of the pattern"
 msgstr "اندازه ی الگو"
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr ""
 
@@ -1006,13 +1022,14 @@ msgstr "مثال"
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr "پر کردن رنگ لایه"
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr "نقطه 1"
 
@@ -1024,6 +1041,7 @@ msgstr "گوشه ی اول مستطیل"
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr "نقطه 2"
 
@@ -1063,9 +1081,9 @@ msgstr "فراتوپ ها"
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr "تغییر رنگ تدریجی"
 
@@ -1129,7 +1147,7 @@ msgid "Blur"
 msgstr "تیرگی"
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr "تار"
 
@@ -1157,7 +1175,8 @@ msgstr "کنتراست"
 msgid "Exposure Adjust"
 msgstr "تنظیم قرار گرفتن در معرض "
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr "تنظیم گاما "
 
@@ -1257,7 +1276,8 @@ msgstr ""
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr "هندسه"
 
@@ -1303,37 +1323,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr ""
 
@@ -1367,14 +1387,14 @@ msgid "Smoothness"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr "مشابه"
 
@@ -1442,7 +1462,8 @@ msgstr "دایره"
 msgid "Radius of the circle"
 msgstr "شعاع دایره"
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr "پر"
 
@@ -1465,8 +1486,9 @@ msgstr "تعیین میل تابع برای پر شدن"
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr "خطی"
 
@@ -1485,7 +1507,7 @@ msgstr "Sigmond"
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr "کسینوس"
 
@@ -1565,9 +1587,11 @@ msgstr "شعاع نقاط درونی ستاره "
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr "زاویه"
 
@@ -1653,10 +1677,10 @@ msgstr "عرض جهانی شیب"
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr "حلقه"
 
@@ -1799,32 +1823,32 @@ msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr "الحاق"
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr "نوع الحاق مورد استفاده"
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr "نزدیکترین همسایه"
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr "زبانه دار کردن"
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr "مکعب"
 
@@ -1882,13 +1906,20 @@ msgid "When checked the gradient is supersampled"
 msgstr "وقتی که علامت خورده باشد گرادیانت فرانمونه سازی می شود"
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr "پیوند"
 
@@ -1910,6 +1941,7 @@ msgid "Seeds the random number generator"
 msgstr "Seeds the random number generator"
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr "سرعت"
 
@@ -1994,8 +2026,9 @@ msgid ""
 "size, and an alpha of 1.0 is used when rendering"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr "معکوس"
 
@@ -2003,8 +2036,9 @@ msgstr "معکوس"
 msgid "If enabled, render the plant in the opposite direction"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr "گام"
 
@@ -2215,7 +2249,7 @@ msgstr ""
 msgid "Importer::open(): Unknown file type -- "
 msgstr ""
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr ""
 
@@ -2227,252 +2261,295 @@ msgstr ""
 msgid "Modifies the position of the layer in the layer stack"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr "روش مخلوط"
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr ""
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr "نام"
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+#, fuzzy
+msgid "First corner of the bounds rectangle"
+msgstr "گوشه ی اول مستطیل"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+#, fuzzy
+msgid "Second corner of the bounds rectangle"
+msgstr "گوشه ی دوم مستطیل"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+#, fuzzy
+msgid "Horizontal subdivisions"
+msgstr "فاصله افقی"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:51
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
-msgstr "ناتوان از باز کردن فایل"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2768,7 +2845,7 @@ msgstr ""
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr ""
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr ""
 
@@ -2970,8 +3047,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr ""
 
@@ -3011,13 +3088,13 @@ msgstr ""
 msgid "Divide"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr ""
 
@@ -3033,12 +3110,14 @@ msgstr ""
 msgid "Darken"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr ""
 
@@ -3152,230 +3231,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr ""
 
@@ -3384,1319 +3493,1355 @@ msgstr ""
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr "X"
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr "قرمز"
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr "سبز"
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr "آبی"
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+msgid "The value to be reversed"
+msgstr ""
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr "بخش"
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr "زمان"
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/fr.gmo b/po/fr.gmo
index e0a0736..4a43d33 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index b3a6dda..205bc9a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -18,10 +18,10 @@
 # Animtim <animtim at gmail.com>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/synfig/language/"
 "fr/)\n"
@@ -40,8 +40,9 @@ msgstr "Texte"
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "Autre"
 
@@ -67,8 +68,9 @@ msgstr "Texte à Rendre"
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "Couleur"
 
@@ -86,7 +88,7 @@ msgstr "Style"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr "Normal"
 
@@ -99,7 +101,7 @@ msgid "Italic"
 msgstr "Italique"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr "Graisse"
 
@@ -169,9 +171,12 @@ msgstr "Orientation du Texte"
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr "Origine"
 
@@ -205,7 +210,7 @@ msgstr "À désactiver si vous animez le texte"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr "Inverser"
 
@@ -251,27 +256,27 @@ msgid "Type of blur to use"
 msgstr "Type de flou à utiliser"
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr "Flou \"Boîte\""
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr "Flou Gaussien Rapide"
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr "Flou Hachuré"
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr "Flou Gaussien"
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr "Flou Circulaire"
 
@@ -358,6 +363,7 @@ msgstr "Déformation Courbe"
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr "Distorsions"
 
@@ -368,13 +374,14 @@ msgstr "Placement de la Spline de destination"
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr "Largeur"
 
@@ -433,7 +440,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr "Il semble que le nom de fichier soit déjà \"%s\" (%s)"
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr "Nom de fichier"
 
@@ -441,7 +448,8 @@ msgstr "Nom de fichier"
 msgid "File to import"
 msgstr "Fichier à importer"
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr "Décalage Temporel"
 
@@ -608,7 +616,8 @@ msgstr "Décalage Extérieur"
 msgid "Scale Outside"
 msgstr "Échelle Extérieure"
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr "Rotation"
 
@@ -625,12 +634,13 @@ msgstr "Point où vous souhaitez que l'origine soit"
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr "Quantité"
 
@@ -652,7 +662,7 @@ msgid "Spherize"
 msgstr "Rendre sphérique"
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr "Position"
 
@@ -667,7 +677,7 @@ msgstr "Lorsque la déformation sphèrique est centrée"
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr "Rayon"
 
@@ -772,12 +782,13 @@ msgstr "Considérer l'Alpha"
 msgid "Avoid alpha artifacts when checked"
 msgstr "Eviter les artefacts de transparence si coché"
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr "Boucle Temporelle"
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr "Début du Lien"
 
@@ -785,16 +796,19 @@ msgstr "Début du Lien"
 msgid "Start time of the loop for the cycled context"
 msgstr "Début de la boucle pour le contexte bouclé."
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr "Temps Local"
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr "Le moment où la boucle resultante commence"
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr "Durée"
 
@@ -818,7 +832,8 @@ msgstr "Symétrique"
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr "Si coché, les boucles sont reflétés centrés sur le Temps Local"
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr "Décaler"
 
@@ -927,11 +942,12 @@ msgstr "Centre du motif"
 msgid "Size of the pattern"
 msgstr "Taille du motif"
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr "Échelle"
 
@@ -1021,13 +1037,14 @@ msgstr "Exemple"
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr "Remplir couleur du calque"
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr "Point 1"
 
@@ -1039,6 +1056,7 @@ msgstr "Premier coin du rectangle"
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr "Point 2"
 
@@ -1078,9 +1096,9 @@ msgstr "Metaballs"
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr "Dégradé"
 
@@ -1149,7 +1167,7 @@ msgid "Blur"
 msgstr "Flou"
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr "Flous"
 
@@ -1177,7 +1195,8 @@ msgstr "Constraste"
 msgid "Exposure Adjust"
 msgstr "Ajustement de l'Exposition"
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr "Ajustement du Gamma"
 
@@ -1277,7 +1296,8 @@ msgstr "Contour Avancé"
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr "Géométrie"
 
@@ -1315,57 +1335,57 @@ msgstr "Valeur à ajouter à la largeur globale"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1149
 msgid "Tip Type at Start"
-msgstr "Type de pointe au démarrage"
+msgstr "Type de Pointe du Début"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1150
 msgid "Defines the Tip type of the first spline point when spline is unlooped"
 msgstr ""
-"Définir le type de Pointe du premier vertex lorsque la spline est ouverte"
+"Définit le type de Pointe du premier vertex lorsque la spline est ouverte"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr "Stop Arrondi"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr "Stop Carré"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr "Stop en Piqué"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr "Stop Plat"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1158
 msgid "Tip Type at End"
-msgstr "Type de Pointe à la Fin"
+msgstr "Type de Pointe de la Fin"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1159
 msgid "Defines the Tip type of the last spline point when spline is unlooped"
 msgstr ""
-"Définir le type de Pointe du dernier vertex lorsque la spline est ouverte"
+"Définit le type de Pointe du dernier vertex lorsque la spline est ouverte"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1167
 msgid "Cusps Type"
@@ -1389,15 +1409,16 @@ msgid "Smoothness"
 msgstr "Douceur"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+#, fuzzy
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 "Détermine l'interpolation entre les points de largeur. (0) Linéaire (1) Doux"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr "Homogène"
 
@@ -1467,7 +1488,8 @@ msgstr "Cercle"
 msgid "Radius of the circle"
 msgstr "Rayon du cercle"
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr "Adoucissement"
 
@@ -1490,8 +1512,9 @@ msgstr "Détermine la fonction d'atténuation pour l'adoucissement"
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr "Linéaire"
 
@@ -1510,7 +1533,7 @@ msgstr "Sigmoïde"
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr "Cosinus"
 
@@ -1590,9 +1613,11 @@ msgstr "Le rayon du corps de l'étoile"
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr "Angle"
 
@@ -1678,10 +1703,10 @@ msgstr "Largeur globale du dégradé"
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr "Boucle"
 
@@ -1826,32 +1851,32 @@ msgstr "Modifier la graine aléatoire du bruit"
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr "Interpolation"
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr "Quel type d'interpolation utiliser"
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr "Voisinage le plus proche"
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr "Spline"
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr "Cubique"
 
@@ -1909,13 +1934,20 @@ msgid "When checked the gradient is supersampled"
 msgstr "Si coché le dégradé est super-échantillonné"
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr "Lien"
 
@@ -1937,6 +1969,7 @@ msgid "Seeds the random number generator"
 msgstr "Distribue le générateur de nombres aléatoires"
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr "Vitesse"
 
@@ -2027,8 +2060,9 @@ msgstr ""
 "Le canal alpha du dégradé est multiplié par la taille de la tige, et une "
 "valeur alpha de 1 est utilisée pour le rendu."
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr "Inverser"
 
@@ -2036,8 +2070,9 @@ msgstr "Inverser"
 msgid "If enabled, render the plant in the opposite direction"
 msgstr "Si actif, rend la plante dans la direction opposée "
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr "Pas"
 
@@ -2255,7 +2290,7 @@ msgstr "Importer::open() : Extension non trouvée"
 msgid "Importer::open(): Unknown file type -- "
 msgstr "Importer::open() : Type de fichier inconnu -- "
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr "Impossible de créer une surface cible"
 
@@ -2267,257 +2302,300 @@ msgstr "Profondeur Z"
 msgid "Modifies the position of the layer in the layer stack"
 msgstr "Modifie la position du calque dans la pile de calques"
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr "Haut-gauche"
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr "Le Coin en haut à gauche de l'image"
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr "Bas-droite"
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr "Le Coin en bas à droite de l'image"
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr "Canal Alpha du calque"
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr "Mode de Fusion"
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr "Le mode de mélange utilisé pour mélanger avec les calques inférieurs"
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr "Dupliquer"
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr "Index"
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr "Copier l'Index"
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr "[MIME]"
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr "Flou Cinétique"
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr "Ouverture"
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr "Temps d'Exposition"
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr "Facteur de Sous-échantillonnage"
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr "Multiplie le Nombre de Sous-échantillons Rendus"
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr "Type de Sous-échantillonnage "
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr "Type de Courbe pour Pondérer les Sous-échantillons"
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr "Constante"
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr "Hyperbolique"
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr "Quantité de Départ du Sous-échantillon"
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 "Quantité Relative du Premier Sous-échantillon, Pour Pondération Linéaire"
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr "Quantité Finale du Sous-échantillon"
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 "Quantité Relative du Dernier Sous-échantillon, Pour Pondération Linéaire."
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr "Position du décalage"
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr "Transformations"
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr "Position, rotation, oblique et échelle"
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr "Canevas"
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr "Grouper le contenu"
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr "Décalage de Temps à appliquer au contexte"
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr "Verrouillage de la sélection"
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr "Si coché, interdit de sélectionner les enfants avec la souris"
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr "Croissance des Contours"
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 "Valeur faisant croître de façon exponentiel l'épaisseur des calques Contours "
 "enfants"
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr "Temps Courant"
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr "Polygone"
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr "Liste des Sommet"
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr "Définit les coins du polygone"
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr "Forme"
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr "Interne"
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr "Couleur du Calque Forme"
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr "Anti-crénelage "
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr "Type d'Adoucissement"
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr "Type d'adoucissement à utiliser"
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr "Mode de Superposition"
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr "Mode de superposition à utiliser"
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr "Non Zéro"
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr "Pair/Impair"
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr "Squelette"
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr "Nom"
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr "Os"
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+#, fuzzy
+msgid "Skeleton Deformation"
+msgstr "transformation"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+#, fuzzy
+msgid "First corner of the bounds rectangle"
+msgstr "Premier coin du rectangle"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+#, fuzzy
+msgid "Second corner of the bounds rectangle"
+msgstr "Second coin du rectangle"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+#, fuzzy
+msgid "Horizontal subdivisions"
+msgstr "Espacement Horizontal"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr "Couleur Pleine"
 
-#: src/synfig/layer_sound.cpp:51
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
-msgstr "Arrondi"
+msgstr "Son"
 
-#: src/synfig/layer_sound.cpp:102
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
-msgstr "Impossible d'ouvrir le fichier"
+msgstr "Emplacement du fichier son"
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
-msgstr ""
+msgstr "Retard"
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
-msgstr ""
+msgstr "Décalage avant la lecture"
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
-msgstr ""
+msgstr "Volume"
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
-msgstr ""
+msgstr "Niveau du son"
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
-msgstr "Commutateur"
+msgstr "Sélecteur"
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr "Nom du Calque Actif"
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr "Seuls les calques avec un nom spécifié sont visibles"
 
@@ -2831,7 +2909,7 @@ msgstr "entité \"author\" vide"
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr "Le canevas '%s' a des valeurs %s:%s non définies"
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr "Nœud de valeur"
 
@@ -3033,8 +3111,8 @@ msgstr "%s ne semble pas être un fichier de palette %s valide"
 msgid "%s does not appear to be a supported palette file"
 msgstr "%s ne semble pas être un fichier palette supporté"
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr "Composé"
 
@@ -3074,13 +3152,13 @@ msgstr "Multiplier"
 msgid "Divide"
 msgstr "Diviser"
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr "Addition"
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr "Soustraction"
 
@@ -3096,12 +3174,14 @@ msgstr "Eclairer"
 msgid "Darken"
 msgstr "Assombrir"
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr "Teinte"
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr "Saturation"
 
@@ -3220,230 +3300,260 @@ msgstr ""
 "Time(): Pas d'unité fournie dans le time code et le nombre d'images par "
 "seconde est inconnu! en supposant SECONDES"
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr "Composé Radial"
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr "Référence"
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr "Tangente du Segment"
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr "Sommet du Segment"
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr "Rayures"
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr "Deux-tons"
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr "Liste Dynamique"
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr "Rotation de Dégradé"
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr "Sinus"
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr "Échange Temporisé"
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr "Répéter le Dégradé"
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr "Exponentiel"
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr "Tangente de Spline"
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr "Sommet de la Spline"
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr "Plage de valeurs"
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr "Cos"
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr "aTan2"
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr "Inverser la Tangente"
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr "Réciproque"
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr "Entier"
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr "Largeur de la Spline"
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr "Angle du Vecteur"
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr "Longueur du Vecteur"
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr "X du vecteur"
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr "Y du vecteur"
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr "Couleur de Dégradé"
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr "Produit Scalaire"
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr "Chaîne de Temps"
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr "Réel"
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr "Chaîne de Réel"
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr "Liste Jointe"
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr "Chaîne d'Angle"
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr "Chaîne d'Entier"
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr "Logarithme"
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr "Grisé"
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr "Puissance"
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr "Comparer"
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr "Non"
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr "Et"
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr "Ou"
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr "Influence de l'Ossature"
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr "Ossature"
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr "Racine de l'Ossature"
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr "Liste Statique"
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr "Poids Ossature Pair"
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr "Lien d'Ossature"
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr "Liste des Points de Largeur"
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr "Liste d'Élément Pointillés"
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr "Moyenne"
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr "Moyenne Pondérée"
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr "Dynamique"
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr "Dérivé"
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr "Mauvais type : Le Nœud de Valeur '%s' n'accepte pas le type '%s'"
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr "Substitut"
 
@@ -3452,1278 +3562,1314 @@ msgstr "Substitut"
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr "%s:%d mauvais type pour %s : besoin de %s et non %s"
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ": Mauvais type"
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr "Un ou deux de mes paramètres ne sont pas définis"
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr "LHS"
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr "Côté Gauche de l'ajout"
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr "RHS"
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr "Côté Droit de l'ajout"
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr "Scalaire"
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr "Valeur qui multiplie l'ajout"
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr "ET"
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr "Lien1"
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr "Première opérande de l'opération AND"
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr "Lien2"
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr "Seconde opérande de l'opération AND"
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr "Valeur pour convertir la chaîne"
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr "Largeur de la chaîne"
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr "Précision"
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr "Nombre de décimales"
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr "Complété avec des zéros"
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 "Si cochée, la chaîne est laissée remplie avec des zéros pour égaler la "
 "largeur"
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr "Un point de passage existe déjà à ce moment"
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr "%s : Vous ne pouvez pas utiliser un %s dans un Nœud de Valeur animé."
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr "Animé"
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr "X"
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr "Cosinus de l'angle"
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr "Y"
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr "Sinus de l'angle"
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr "Pas d'entrées dans la liste"
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr "Pas d'entrées dans la liste ret_list"
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr "Sommet %03d"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr "La Spline à laquelle la tangente est liée"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr "Si cochée, le quantité boucle"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr "La position sur la Spline de la tangente liée (0,1]"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr "Décalage"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr "Décalage de l'angle de la tangente"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr "Échelle de la tangente"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr "Longueur Fixe"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr "Si cochée, la longueur de la tangente est fixée"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr "Si coché, la tangente est basée sur la longueur de la Spline"
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr "La spline à laquelle le sommet est lié"
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr "La position sur la Spline du sommet lié (0,1]"
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr "Si coché, la position est basée sur la longueur de la Spline"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr "Le spline à laquelle la largeur est liée"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr "La position sur la Spline de la largeur liée (0,1]"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr "Échelle de la largeur"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr "Si coché, la largeur est basée sur la longueur de la Spline"
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr "La tangente référencée à inverser"
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr "Si coché, la référence est inversée"
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr "Os %d"
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr "Le nom de l'Os"
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr "Parent"
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr "L'Os Parent de l'Os"
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr "L'origine de rotation de l'Os relativement à son parent"
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr "L'angle de rotation de l'Os relativement à son parent"
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr "Longueur Locale d'Échelle"
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr "L'échelle de l'os est alignée sur sa longueur"
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr "Largeur de l'Os"
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr "Largeur de l'Os à son origine"
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr "Échelle de Longueur Récursive"
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr "L'échelle de l'ossature et de ces enfants est définit par sa longueur"
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr "Largeur de l'extrémité"
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr "Largeur de l'os à son extrémité"
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr "Profondeur Z"
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr "La profondeur z de l'os"
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr "Paramètre de Longueur"
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr "La longueur de l'os à l'installation"
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr "Racine"
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr "Liste du Poids des Os"
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr "Liste des os utilisés pour calculer l'influence"
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr "Le noeud de valeur devenant influencé par l'ossature"
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr "L'Os lié"
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr "Valeur de Base"
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr "Faire translation"
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr "Faire rotation"
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr "Inclinaison"
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr "Réaliser l'inclinaison"
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr "Échelle X"
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr "Agrandir/Réduire par l'axe X"
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr "Échelle Y"
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr "Agrandir/Réduire par l'axe Y"
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr "Os utilisés pour définir l'influence"
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr "poids"
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr "Valeur relative de l'influence de l'os"
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr "Le côté gauche de la comparaison"
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr "Le côté droit de la comparaison"
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr "Plus grand"
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr "Si cochée, renvoie vrai si LHS > RHS"
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr "Égal"
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr "Si cochée, renvoie vrai si LHS = RHS"
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr "Moins"
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr "Si cochée, renvoie vrai si LHS < RHS"
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr "Erreur de type pour un composé"
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr "Rouge"
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr "La composante ROUGE de la couleur"
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr "Vert"
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr "La composante VERTE de la couleur"
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr "Bleu"
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr "La composante BLEU de la couleur"
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr "Alpha"
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr "La transparence alpha de la couleur"
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr "Sommet 1"
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr "Le premier sommet du segment"
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr "Tangente 1"
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr "La première tangente du segment"
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr "Sommet 2"
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr "Le second sommet du segment"
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr "Tangente 2"
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr "La seconde tangente du segment"
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr "Axe X"
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr "la composante axe-X du vecteur"
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr "Axe Y"
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr "la composante axe-Y du vecteur"
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr "Sommet"
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr "Le sommet du Point de Spline"
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr "La largeur du Point de Spline"
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr "Définit les positions ON/OFF relatives aux voisins"
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr "Séparer"
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr "Si cochée, les tangentes sont indépendantes"
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr "La première tangente du Point de Spline"
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr "La seconde tangente du Point de Spline"
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr "Séparer Rayon"
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr "Si coché, les rayons de la tangente sont indépendant"
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr "Séparer Angle"
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr "Si coché, les angles de la tangente sont indépendant"
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr "La position [0, 1] du Point de Largeur sur la Spline"
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr "La largeur du Point de Largeur"
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr "Type de Côté Antérieur"
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr "Définit le type d'interpolation du point de largeur"
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr "Interpoler"
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr "Type de Côté Postérieur"
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr "Limite inférieure"
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr "Définir la position de début de la Spline"
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr "Limite supérieure"
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr "Définir la position de fin de la Spline"
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr "Le longueur du décalage de l'élément pointillé sur la Spline"
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr "Longueur"
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr "Longueur de l'Élément Pointillés"
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr "Définit le type de côté de l'élément pointillés"
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr "La partie Décalage de la transformation"
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr "La partie Angle de la transformation"
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr "Angle Inclinaison"
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr "La partie Angle d'Inclinaison de la transformation"
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr "La partie Échelle de la transformation"
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr "Poids de la valeur"
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr "Valeur"
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr "La Valeur"
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr "Première"
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr "La Première Valeur"
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr "Seconde"
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr "La Seconde Valeur"
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr "Valeur pour calculer le cosinus"
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr "Amplitude"
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
-msgstr "Multiplier du cosinus résultant"
+msgstr "Multiplicateur du cosinus résultant"
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr "Valeur pour calculer la dérivée"
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr "Intervalle"
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr "Intervalle de temps pour calculer les différences finit"
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr "Précision"
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr "Précision de la dérivée"
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr "Grossière"
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr "Fine"
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr "Extrême"
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr "Ordre"
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr "Ordre de la dérivée"
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr "Première dérivée"
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr "Seconde dérivée"
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr "DashItem %03d"
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr "Le côté gauche du produit scalaire"
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr "Le côté droit du produit scalaire"
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr "Depuis"
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr "Valeur initiale de l'index"
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr "Vers"
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr "Valeur finale de l'index"
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr "Quantité d'augmentation de l'index"
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
-msgstr ""
+msgstr "Extrémité statique"
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr "Point d'équilibre sans force extérieure"
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr "Base du système dynamique"
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr "Force"
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr "Force externe appliquée au centre de gravité de la masse"
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr "Torque"
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr "Impulsion extérieure appliquée au centre d'inertie"
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr "Coefficient d'amortissement"
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr "Coefficient d'amortissement radial du système dynamique"
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr "Coefficient de friction"
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr "Coefficient de friction rotationelle du système dynamique"
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr "Coefficient de Compression"
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr "Coefficient de compression radiale du système dynamique"
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr "Coefficient de Torsion"
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr "Coefficient de torsion du système dynamique"
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr "Masse"
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr "Masse du système dynamique"
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr "Moment d'Inertie"
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr "Moment d'inertie du système dynamique"
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr "Rigidité de l'élasticité"
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr "Si coché, l'élasticité linéaire est rigide"
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr "Rigidité de la torsion"
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr "Si coché, l'élasticité de la torsion est rigide"
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
-msgstr ""
+msgstr "Origine traîne extrémité"
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 "Si coché, le résultat est l'origine + l'extrémité, sinon uniquement "
 "l'extrémité"
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr "Incompatibilité entre type et élément de liste, générant une erreur"
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr "Élément %03d"
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr "Exposant"
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr "La valeur pour augmenter la constante 'e'"
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr "Multiplicateur de l'exposant résultant"
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr "Le dégradé depuis lequel la couleur est choisit"
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr "La position de la couleur dans le dégradé (0,1]"
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr "Si coché, l'index bouclera"
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr "Le dégradé source à faire tourner"
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr "La quantité de décalage du dégradé"
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr "La valeur grisée"
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr "la valeur entière à convertir"
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr "Entier"
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr "Chaînes"
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr "La Liste de chaînes à joindre"
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr "Avant"
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr "La chaîne à placer avant les chaînes jointes"
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr "Séparateur"
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr "La chaîne à placer entre chaque chaîne jointe"
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr "Après"
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr "La chaîne à placer après les chaînes jointes"
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr "Taux"
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr "Valeur qui est multipliée par le temps actuel (en secondes)"
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr "Pente"
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr "La valeur retournée quand le temps actuel est nul"
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr "Noeud valeur utilisé pour calculer le logarithme Népérien"
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr "Epsilon"
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr "Valeur utilisé pour comparé le 'lien' avec zéro"
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr "Infini"
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 "Détermine la manière d'interpoler une valeur d'un choix aléatoire à l'autre"
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr "NON"
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr "Noeud de valeur utilisé pour l'opération NON"
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr "OU"
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr "Noeud de valeur utilisé pour l'opération OU"
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr "Base"
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr "La base à élever à la puissance"
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr "La puissance utilisée pour élever la base"
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr "Valeur utilisée pour comparer la base ou la puissance avec zero"
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr "Mauvais type de composé radial"
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr "Luminance"
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr "La longueur du vecteur"
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr "Thêta"
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr "L'angle du vecteur avec l'axe X"
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr "Certains de mes paramètres ne sont pas définis"
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr "Min"
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr "Valeur retournée lorsque le Lien est plus petit"
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr "Max"
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr "Valeur retournée lorsque le Lien est plus grand"
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr "Le Noeud de valeur pour limiter sa portée"
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr "La valeur réel devant être convertie"
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr "Le noeud de valeur utilisé pour calculer sa réciproque"
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 "La valeur utilisée pour décider si le Lien est trop petit pour obtenir sa "
 "réciproque"
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr "La valeur obtenue lorsque 'Lien' < 'Epsilon'"
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr "La valeur de référence"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr "Le dégradé source à répéter"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr "Nombre"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr "Le nombre de répétition du dégradé"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 "Détermine la quantité de biais du dégradé source dans la répétition [0,1]"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr "Définir le Début"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 "Si cochée, 'Couleur de Départ' est utilisé comme point de départ du dégradé "
 "résultant"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr "Définir la Fin"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 "Si cochée, 'Couleur de Fin' est utilisé comme point de départ du dégradé "
 "résultant"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr "Couleur de Début"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr "Utilisé comme point de départ du dégradé résultant"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr "Couleur de Fin"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr "Utilisé comme point final du dégradé résultant"
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+#, fuzzy
+msgid "The value to be reversed"
+msgstr "La valeur réel devant être convertie"
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr "Tentative d'obtenir l'inverse d'un Nœud de Valeur non inversable"
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr "Le nœud de valeur utilisé pour redimensionner"
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr "Valeur qui multiplie le nœud de valeur"
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr "Segment"
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr "Le Segment où la tangente est liée"
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr "La position de la tangente liée sur le Segment (0,1]"
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr "Le Segment où le sommet est lié"
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr "La position du sommet lié sur le Segment (0,1]"
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr "L'angle à partir duquel le sinus est calculé"
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr "La valeur qui multiplie le sinus résultant"
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr "Le noeud de valeur utilisé pour faire l'étape"
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr "La durée de l'étape"
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr "Temps de Début"
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr "Le moment où l'étape de conversion démarre"
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr "Intersection"
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr "Valeur qui définit si le pas est centré sur la valeur [0, 1]"
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr "Couleur 1"
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr "Une couleur des rayures du dégradé"
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr "Couleur 2"
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr "Autre couleur des rayures du dégradé"
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr "Nombre de Rayures"
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr "Nombre de bandes dans le dégradé"
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr "Largeur des bandes dans le dégradé entre [0,1]"
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr "Côté Gauche de la soustraction"
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr "Côté Droit de la soustraction"
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr "Valeur qui multiplie la soustraction"
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr "Lien Off"
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
-msgstr "Le noeud de valeur retourné quand le switch est sur Off"
+msgstr "Le noeud de valeur retourné quand le sélecteur est sur Off"
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr "Lien On"
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
-msgstr "Le noeud de valeur retourné quand le switch est sur On"
+msgstr "Le noeud de valeur retourné quand le sélecteur est sur On"
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr "Si coché, renvoie \"Lien On\", sinon renvoie \"Lien Off\""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 "Le noeud de valeur retourné quand le temps actuel est avant le \"temps\" - "
 "\"longueur\""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 "Le nœud de valeur retourné quand le temps actuel est après le \"temps\""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr "Temps"
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr "Le moment où se termine l'interpolation linéaire"
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
@@ -4731,57 +4877,58 @@ msgstr ""
 "La longueur du temps lorsque l'interpolation linéaire entre \"Avant\" et "
 "\"Après\" est faite"
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr "Le noeud de valeur de boucle temporelle"
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr "Point de départ de la boucle pour le nœud de valeur Axe de Temps"
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr "Durée de la boucle"
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr "Le temps qui est converti vers la chaîne"
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr "La couleur de départ du dégradé"
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr "La couleur de fin du dégradé"
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr "Vecteur"
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr "Le vecteur à partir duquel est calculé l'angle"
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr "Le vecteur à partir duquel est calculé la longueur"
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr "Le vecteur à partir duquel est extraite la coordonnée X"
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr "Le vecteur à partir duquel est extraite la coordonnée Y"
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr "Moyenne pondérée"
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr "Point de Largeur %03d"
@@ -4996,7 +5143,7 @@ msgstr "Tester l'implémentation des signaux"
 
 #: src/tool/main.cpp:247
 msgid "Try 'synfig --help' for more information"
-msgstr ""
+msgstr "Tentez 'synfig --help' pour plus d'informations"
 
 #: src/tool/joblistprocessor.cpp:73
 msgid "Nothing to do!"
diff --git a/po/gl.gmo b/po/gl.gmo
index bba979a..080d987 100644
Binary files a/po/gl.gmo and b/po/gl.gmo differ
diff --git a/po/gl.po b/po/gl.po
index aafb22d..bb7f535 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the Synfig Core package.
 #
 # Translators:
+# Miguel Anxo Bouzada <mbouzada at gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/synfig/language/"
 "gl/)\n"
@@ -21,32 +22,33 @@ msgstr ""
 #: src/modules/lyr_freetype/lyr_freetype.cpp:66
 #: src/modules/lyr_freetype/lyr_freetype.cpp:569
 msgid "Text"
-msgstr ""
+msgstr "Texto"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:67
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
-msgstr ""
+msgstr "Outro"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:97
 msgid "Text Layer"
-msgstr ""
+msgstr "Capa de texto"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:398
 msgid "unable to initialize"
-msgstr ""
+msgstr "non é posíbel preparalo"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:417
 msgid "empty font set"
-msgstr ""
+msgstr "conxunto baleiro de tipos de letra"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:570
 msgid "Text to Render"
-msgstr ""
+msgstr "Texto que renderizar"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:575
 #: src/modules/lyr_std/shade.cpp:622
@@ -54,77 +56,78 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
-msgstr ""
+msgstr "Cor"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:576
 msgid "Color of the text"
-msgstr ""
+msgstr "Cor do texto"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:580
 msgid "Font Family"
-msgstr ""
+msgstr "Familia do tipo de letra"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:585
 msgid "Style"
-msgstr ""
+msgstr "Estilo"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:588
 msgid "Oblique"
-msgstr ""
+msgstr "Oblicua"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:589
 msgid "Italic"
-msgstr ""
+msgstr "Cursiva"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
-msgstr ""
+msgstr "Peso"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:595
 msgid "Ultralight"
-msgstr ""
+msgstr "Ultralixeira"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:596
 msgid "light"
-msgstr ""
+msgstr "Lixeira"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:598
 msgid "Bold"
-msgstr ""
+msgstr "Negra"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:599
 msgid "Ultrabold"
-msgstr ""
+msgstr "Ultranegra"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:600
 msgid "Heavy"
-msgstr ""
+msgstr "Pesada"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:603
 msgid "Horizontal Spacing"
-msgstr ""
+msgstr "Espazado horizontal"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:604
 msgid "Describes how close glyphs are horizontally"
-msgstr ""
+msgstr "Describe canto de xuntos están os glifos horizontalmente"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:608
 msgid "Vertical Spacing"
-msgstr ""
+msgstr "Espazado vertical"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:609
 msgid "Describes how close lines of text are vertically"
-msgstr ""
+msgstr "Describe canto de xuntas están as liñas vericalmente"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:613
 #: src/modules/lyr_std/shade.cpp:628 src/modules/lyr_std/xorpattern.cpp:133
@@ -133,19 +136,19 @@ msgstr ""
 #: src/modules/mod_geometry/checkerboard.cpp:154
 #: src/modules/mod_noise/distort.cpp:227 src/modules/mod_noise/noise.cpp:276
 msgid "Size"
-msgstr ""
+msgstr "Tamaño"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:614
 msgid "Size of the text"
-msgstr ""
+msgstr "Tamaño do texto"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:621
 msgid "Orientation"
-msgstr ""
+msgstr "Orientación"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:622
 msgid "Text Orientation"
-msgstr ""
+msgstr "Orientación do texto"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:627
 #: src/modules/lyr_std/curvewarp.cpp:398 src/modules/lyr_std/insideout.cpp:162
@@ -156,45 +159,48 @@ msgstr ""
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
-msgstr ""
+msgstr "Orixe"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:628
 msgid "Text Position"
-msgstr ""
+msgstr "Posición do texto"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:632
 msgid "Font"
-msgstr ""
+msgstr "Tipo de letra"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:633
 msgid "Filename of the font to use"
-msgstr ""
+msgstr "Nome de ficheiro do tipo de letra a usar"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:640
 msgid "Kerning"
-msgstr ""
+msgstr "Solapado das letras (kerning)"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:641
 msgid "Enables/Disables font kerning (If the font supports it)"
-msgstr ""
+msgstr "Activa/desactiva o solapado das letras (se o tipo de letra o admite)"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:645
 msgid "Sharpen Edges"
-msgstr ""
+msgstr "Bordos afiados"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:646
 msgid "Turn this off if you are going to be animating the text"
-msgstr ""
+msgstr "Desmarque isto se vai animar o texto"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
-msgstr ""
+msgstr "Inverter"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:716
 msgid "No face loaded, no text will be rendered."
@@ -202,7 +208,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:742
 msgid "Text too small, no text will be rendered."
-msgstr ""
+msgstr "Texto pequeno de máis, non se amosará ningún texto"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:766
 msgid "Unable to set face size."
@@ -210,92 +216,92 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:809
 msgid "Invalid multibyte sequence - is the locale set?\n"
-msgstr ""
+msgstr "Secuencia multibyte incorrecta - estabeleceuse o idioma local?\n"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:816
 msgid "Can't parse multibyte character.\n"
-msgstr ""
+msgstr "Non é posíbel analizar caracteres multibyte.\n"
 
 #: src/modules/lyr_std/bevel.cpp:69 src/modules/mod_example/filledrect.cpp:157
 #: src/modules/mod_geometry/advanced_outline.cpp:1172
 msgid "Bevel"
-msgstr ""
+msgstr "Bisel"
 
 #: src/modules/lyr_std/bevel.cpp:70 src/modules/lyr_std/shade.cpp:69
 msgid "Stylize"
-msgstr ""
+msgstr "Estilizar"
 
 #: src/modules/lyr_std/bevel.cpp:626 src/modules/lyr_std/shade.cpp:634
 #: src/modules/mod_filter/blur.cpp:419
 #: src/modules/mod_filter/halftone2.cpp:174
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #: src/modules/lyr_std/bevel.cpp:627 src/modules/lyr_std/shade.cpp:635
 #: src/modules/mod_filter/blur.cpp:420
 msgid "Type of blur to use"
-msgstr ""
+msgstr "Tipo de desenfoque a usar"
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
-msgstr ""
+msgstr "Desenfoque de caixa"
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
-msgstr ""
+msgstr "Desenfoque Gaussiano rápido"
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
-msgstr ""
+msgstr "Desenfoque de malla"
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
-msgstr ""
+msgstr "Desenfoque Gaussiano"
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
-msgstr ""
+msgstr "Desenfoque de disco"
 
 #: src/modules/lyr_std/bevel.cpp:637
 msgid "Hi-Color"
-msgstr ""
+msgstr "Cor clara"
 
 #: src/modules/lyr_std/bevel.cpp:640
 msgid "Lo-Color"
-msgstr ""
+msgstr "Cor escura"
 
 #: src/modules/lyr_std/bevel.cpp:643
 msgid "Light Angle"
-msgstr ""
+msgstr "Ángulo da luz"
 
 #: src/modules/lyr_std/bevel.cpp:647
 msgid "Depth of Bevel"
-msgstr ""
+msgstr "Profundidade do bisel"
 
 #: src/modules/lyr_std/bevel.cpp:651
 msgid "Softness"
-msgstr ""
+msgstr "Suavidade"
 
 #: src/modules/lyr_std/bevel.cpp:654
 msgid "Use Luma"
-msgstr ""
+msgstr "Usar a luminancia"
 
 #: src/modules/lyr_std/bevel.cpp:657
 msgid "Solid"
-msgstr ""
+msgstr "Sólido"
 
 #: src/modules/lyr_std/booleancurve.cpp:107
 msgid "Region Set"
-msgstr ""
+msgstr "Conxunto de área"
 
 #: src/modules/lyr_std/booleancurve.cpp:108
 msgid "Set of regions to combine"
-msgstr ""
+msgstr "Conxunto de áreas que combinar"
 
 #: src/modules/lyr_std/clamp.cpp:55 src/tool/printing_functions.cpp:218
 msgid "Clamp"
@@ -306,11 +312,11 @@ msgstr ""
 #: src/modules/mod_filter/halftone3.cpp:60
 #: src/modules/mod_filter/lumakey.cpp:60
 msgid "Filters"
-msgstr ""
+msgstr "Filtros"
 
 #: src/modules/lyr_std/clamp.cpp:162
 msgid "Invert Negative"
-msgstr ""
+msgstr "Inverter negativo"
 
 #: src/modules/lyr_std/clamp.cpp:166
 msgid "Clamp Ceiling"
@@ -318,11 +324,11 @@ msgstr ""
 
 #: src/modules/lyr_std/clamp.cpp:167
 msgid "When checked the Ceiling value is used"
-msgstr ""
+msgstr "Cando está marcado usase o valor teito"
 
 #: src/modules/lyr_std/clamp.cpp:171
 msgid "Ceiling"
-msgstr ""
+msgstr "Teito"
 
 #: src/modules/lyr_std/clamp.cpp:172
 msgid "Upper boundary of the clamping"
@@ -330,7 +336,7 @@ msgstr ""
 
 #: src/modules/lyr_std/clamp.cpp:176
 msgid "Floor"
-msgstr ""
+msgstr "Chan"
 
 #: src/modules/lyr_std/clamp.cpp:177
 msgid "Lower boundary of the clamping"
@@ -338,51 +344,53 @@ msgstr ""
 
 #: src/modules/lyr_std/curvewarp.cpp:56
 msgid "Curve Warp"
-msgstr ""
+msgstr "Deformación curva"
 
 #: src/modules/lyr_std/curvewarp.cpp:57 src/modules/lyr_std/insideout.cpp:56
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
-msgstr ""
+msgstr "Distorsións"
 
 #: src/modules/lyr_std/curvewarp.cpp:399
 msgid "Position of the destiny Spline line"
-msgstr ""
+msgstr "Posición da liña Spline de destino"
 
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
-msgstr ""
+msgstr "Largura"
 
 #: src/modules/lyr_std/curvewarp.cpp:404
 msgid "How much is expanded the result perpendicular to the source line"
-msgstr ""
+msgstr "Canto se expande o resultado perpendicularmente á liña orixe"
 
 #: src/modules/lyr_std/curvewarp.cpp:407
 msgid "Start Point"
-msgstr ""
+msgstr "Punto inicial"
 
 #: src/modules/lyr_std/curvewarp.cpp:409
 msgid "First point of the source line"
-msgstr ""
+msgstr "Primeiro punto da liña de orixe"
 
 #: src/modules/lyr_std/curvewarp.cpp:412
 msgid "End Point"
-msgstr ""
+msgstr "Punto final"
 
 #: src/modules/lyr_std/curvewarp.cpp:413
 msgid "Final point of the source line"
-msgstr ""
+msgstr "Punto final da liña de orixe"
 
 #: src/modules/lyr_std/curvewarp.cpp:416
 #: src/modules/mod_geometry/advanced_outline.cpp:1134
@@ -391,92 +399,93 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:559
 #: src/modules/mod_particle/plant.cpp:424
 msgid "Vertices"
-msgstr ""
+msgstr "Vértices"
 
 #: src/modules/lyr_std/curvewarp.cpp:419
 msgid "List of Spline Points where the source line is curved to"
-msgstr ""
+msgstr "Lista de puntos da liña Spline cara onde se curva a liña orixe"
 
 #: src/modules/lyr_std/curvewarp.cpp:422
 #: src/modules/mod_geometry/advanced_outline.cpp:1189
 #: src/modules/mod_gradient/curvegradient.cpp:580
 msgid "Fast"
-msgstr ""
+msgstr "Rápido"
 
 #: src/modules/lyr_std/curvewarp.cpp:423
 #: src/modules/mod_gradient/curvegradient.cpp:581
 msgid "When checked, renders quickly but with artifacts"
-msgstr ""
+msgstr "Cando está marcado, renderiza rapidamente, máis con artefactos"
 
 #: src/modules/lyr_std/import.cpp:60
 msgid "Import Image"
-msgstr ""
+msgstr "Importar imaxe"
 
 #: src/modules/lyr_std/import.cpp:161 src/modules/lyr_std/import.cpp:218
 #, c-format
 msgid "Filename seems to already be set to \"%s\" (%s)"
-msgstr ""
+msgstr "Semella que o nome de ficheiro xa foi estabelecido para «%s» (%s)"
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
-msgstr ""
+msgstr "Nome de ficheiro"
 
 #: src/modules/lyr_std/import.cpp:318
 msgid "File to import"
-msgstr ""
+msgstr "Ficheiro que importar"
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
-msgstr ""
+msgstr "Desprazamento do tempo"
 
 #: src/modules/lyr_std/import.cpp:323
 msgid "Time Offset to apply to the imported file"
-msgstr ""
+msgstr "Desprazamento de tempo que aplicar ao ficheiro importado"
 
 #: src/modules/lyr_std/insideout.cpp:55
 msgid "Inside Out"
-msgstr ""
+msgstr "De dentro cara fora"
 
 #: src/modules/lyr_std/insideout.cpp:163
 msgid "Defines where the center will be"
-msgstr ""
+msgstr "Define onde estará o centro"
 
 #: src/modules/lyr_std/julia.cpp:56
 msgid "Julia Set"
-msgstr ""
+msgstr "Conxunto de Julia"
 
 #: src/modules/lyr_std/julia.cpp:57 src/modules/lyr_std/mandelbrot.cpp:57
 msgid "Fractals"
-msgstr ""
+msgstr "Fractais"
 
 #: src/modules/lyr_std/julia.cpp:335
 msgid "Inside Color"
-msgstr ""
+msgstr "Cor interior"
 
 #: src/modules/lyr_std/julia.cpp:336
 msgid "Color of the Set"
-msgstr ""
+msgstr "Cor do conxunto"
 
 #: src/modules/lyr_std/julia.cpp:339
 msgid "Outside Color"
-msgstr ""
+msgstr "Cor exterior"
 
 #: src/modules/lyr_std/julia.cpp:340
 msgid "Color outside the Set"
-msgstr ""
+msgstr "Cor fora do conxunto"
 
 #: src/modules/lyr_std/julia.cpp:343
 msgid "Color Shift"
-msgstr ""
+msgstr "Cambio de cor"
 
 #: src/modules/lyr_std/julia.cpp:346 src/modules/lyr_std/mandelbrot.cpp:219
 msgid "Iterations"
-msgstr ""
+msgstr "Iteracións"
 
 #: src/modules/lyr_std/julia.cpp:349
 msgid "Seed Point"
-msgstr ""
+msgstr "Punto de semente"
 
 #: src/modules/lyr_std/julia.cpp:352 src/modules/lyr_std/mandelbrot.cpp:222
 msgid "Bailout ValueBase"
@@ -485,68 +494,68 @@ msgstr ""
 #: src/modules/lyr_std/julia.cpp:356 src/modules/lyr_std/mandelbrot.cpp:232
 #: src/modules/lyr_std/twirl.cpp:130
 msgid "Distort Inside"
-msgstr ""
+msgstr "Distorsionar o interior"
 
 #: src/modules/lyr_std/julia.cpp:359 src/modules/lyr_std/mandelbrot.cpp:236
 msgid "Shade Inside"
-msgstr ""
+msgstr "Sombrear o interior"
 
 #: src/modules/lyr_std/julia.cpp:362 src/modules/lyr_std/mandelbrot.cpp:240
 msgid "Solid Inside"
-msgstr ""
+msgstr "Interior sólido"
 
 #: src/modules/lyr_std/julia.cpp:365 src/modules/lyr_std/mandelbrot.cpp:244
 msgid "Invert Inside"
-msgstr ""
+msgstr "Inverter o interior"
 
 #: src/modules/lyr_std/julia.cpp:368
 msgid "Color Inside"
-msgstr ""
+msgstr "Colorear o interior"
 
 #: src/modules/lyr_std/julia.cpp:371 src/modules/lyr_std/mandelbrot.cpp:261
 #: src/modules/lyr_std/twirl.cpp:135
 msgid "Distort Outside"
-msgstr ""
+msgstr "Distorsionar o exterior"
 
 #: src/modules/lyr_std/julia.cpp:374 src/modules/lyr_std/mandelbrot.cpp:265
 msgid "Shade Outside"
-msgstr ""
+msgstr "Sombrear o exterior"
 
 #: src/modules/lyr_std/julia.cpp:377 src/modules/lyr_std/mandelbrot.cpp:269
 msgid "Solid Outside"
-msgstr ""
+msgstr "Exterior sólido"
 
 #: src/modules/lyr_std/julia.cpp:380 src/modules/lyr_std/mandelbrot.cpp:273
 msgid "Invert Outside"
-msgstr ""
+msgstr "Inverter o exterior"
 
 #: src/modules/lyr_std/julia.cpp:383
 msgid "Color Outside"
-msgstr ""
+msgstr "Colorear o exterior"
 
 #: src/modules/lyr_std/julia.cpp:387
 msgid "Color Cycle"
-msgstr ""
+msgstr "Ciclo de cor"
 
 #: src/modules/lyr_std/julia.cpp:390 src/modules/lyr_std/mandelbrot.cpp:281
 msgid "Smooth Outside"
-msgstr ""
+msgstr "Suavizar o exterior"
 
 #: src/modules/lyr_std/julia.cpp:391 src/modules/lyr_std/mandelbrot.cpp:282
 msgid "Smooth the coloration outside the set"
-msgstr ""
+msgstr "Suavizar a coloración exterior do conxunto"
 
 #: src/modules/lyr_std/julia.cpp:394 src/modules/lyr_std/mandelbrot.cpp:226
 msgid "Break Set"
-msgstr ""
+msgstr "Quebrar o conxunto"
 
 #: src/modules/lyr_std/julia.cpp:395 src/modules/lyr_std/mandelbrot.cpp:227
 msgid "Modify equation to achieve interesting results"
-msgstr ""
+msgstr "Modificar a ecuación para obter resultados interesantes"
 
 #: src/modules/lyr_std/mandelbrot.cpp:56
 msgid "Mandelbrot Set"
-msgstr ""
+msgstr "Conxunto de Mandelbrot"
 
 #: src/modules/lyr_std/mandelbrot.cpp:233
 #: src/modules/lyr_std/mandelbrot.cpp:237
@@ -556,19 +565,19 @@ msgstr ""
 #: src/modules/lyr_std/mandelbrot.cpp:253
 #: src/modules/lyr_std/mandelbrot.cpp:257
 msgid "Inside"
-msgstr ""
+msgstr "Interior"
 
 #: src/modules/lyr_std/mandelbrot.cpp:248
 msgid "Gradient Inside"
-msgstr ""
+msgstr "Degradado interior"
 
 #: src/modules/lyr_std/mandelbrot.cpp:252
 msgid "Offset Inside"
-msgstr ""
+msgstr "Desprazamento interior"
 
 #: src/modules/lyr_std/mandelbrot.cpp:256
 msgid "Loop Inside"
-msgstr ""
+msgstr "Bucle interior"
 
 #: src/modules/lyr_std/mandelbrot.cpp:262
 #: src/modules/lyr_std/mandelbrot.cpp:266
@@ -579,71 +588,73 @@ msgstr ""
 #: src/modules/lyr_std/mandelbrot.cpp:287
 #: src/modules/lyr_std/mandelbrot.cpp:291
 msgid "Outside"
-msgstr ""
+msgstr "Exterior"
 
 #: src/modules/lyr_std/mandelbrot.cpp:277
 msgid "Gradient outside"
-msgstr ""
+msgstr "Degradado exterior"
 
 #: src/modules/lyr_std/mandelbrot.cpp:286
 msgid "Offset Outside"
-msgstr ""
+msgstr "Desprazamento exterior"
 
 #: src/modules/lyr_std/mandelbrot.cpp:290
 msgid "Scale Outside"
-msgstr ""
+msgstr "Escala exterior"
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
-msgstr ""
+msgstr "Rotar"
 
 #: src/modules/lyr_std/rotate.cpp:57 src/modules/lyr_std/translate.cpp:56
 #: src/modules/lyr_std/zoom.cpp:53
 msgid "Transform"
-msgstr ""
+msgstr "Transformar"
 
 #: src/modules/lyr_std/rotate.cpp:118 src/modules/lyr_std/translate.cpp:101
 #: src/modules/mod_filter/radialblur.cpp:111
 msgid "Point where you want the origin to be"
-msgstr ""
+msgstr "Apunta onde vostede queira que estea a orixe"
 
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
-msgstr ""
+msgstr "Cantidade"
 
 #: src/modules/lyr_std/rotate.cpp:123
 msgid "Amount of rotation"
-msgstr ""
+msgstr "Cantidade de rotación"
 
 #: src/modules/lyr_std/shade.cpp:68
 msgid "Shade"
-msgstr ""
+msgstr "Sombra"
 
 #: src/modules/lyr_std/shade.cpp:629
 msgid "Size of Shade"
-msgstr ""
+msgstr "Tamaño da sombra"
 
 #: src/modules/lyr_std/sphere_distort.cpp:74
 #: src/modules/lyr_std/sphere_distort.cpp:167
 msgid "Spherize"
-msgstr ""
+msgstr "Esferizar"
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
-msgstr ""
+msgstr "Posición"
 
 #: src/modules/lyr_std/sphere_distort.cpp:142
 msgid "Where the sphere distortion is centered"
-msgstr ""
+msgstr "Onde se centra a distorsión esférica"
 
 #: src/modules/lyr_std/sphere_distort.cpp:146
 #: src/modules/lyr_std/twirl.cpp:117
@@ -652,49 +663,49 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
-msgstr ""
+msgstr "Radio"
 
 #: src/modules/lyr_std/sphere_distort.cpp:149
 msgid "The size of the sphere distortion"
-msgstr ""
+msgstr "O tamaño da distorsión esférica"
 
 #: src/modules/lyr_std/sphere_distort.cpp:155
 msgid "The distortion intensity (negative values inverts effect)"
-msgstr ""
+msgstr "A intensidade da distorsión (os valores negativos inverten o efecto)"
 
 #: src/modules/lyr_std/sphere_distort.cpp:159 src/modules/lyr_std/warp.cpp:415
 msgid "Clip"
-msgstr ""
+msgstr "Recortar"
 
 #: src/modules/lyr_std/sphere_distort.cpp:160
 msgid "When cheked, the area outside the Radius are not distorted"
-msgstr ""
+msgstr "Cando está marcado, a área fora do radio non se distorsiona"
 
 #: src/modules/lyr_std/sphere_distort.cpp:164
 msgid "Distort Type"
-msgstr ""
+msgstr "Tipo de distorsión"
 
 #: src/modules/lyr_std/sphere_distort.cpp:165
 msgid "The direction of the distortion"
-msgstr ""
+msgstr "A dirección da distorsión"
 
 #: src/modules/lyr_std/sphere_distort.cpp:168
 msgid "Vertical Bar"
-msgstr ""
+msgstr "Barra vertical"
 
 #: src/modules/lyr_std/sphere_distort.cpp:169
 msgid "Horizontal Bar"
-msgstr ""
+msgstr "Barra horizontal"
 
 #: src/modules/lyr_std/stretch.cpp:57
 msgid "Stretch"
-msgstr ""
+msgstr "Encoller"
 
 #: src/modules/lyr_std/stretch.cpp:106
 msgid "Size of the stretch relative to its Center"
-msgstr ""
+msgstr "O tamaño do encollemento relativo ao seu centro"
 
 #: src/modules/lyr_std/stretch.cpp:110 src/modules/lyr_std/twirl.cpp:112
 #: src/modules/mod_example/simplecircle.cpp:112
@@ -702,23 +713,23 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:118
 #: src/modules/mod_gradient/spiralgradient.cpp:118
 msgid "Center"
-msgstr ""
+msgstr "Centro"
 
 #: src/modules/lyr_std/stretch.cpp:111
 msgid "Where the stretch distortion is centered"
-msgstr ""
+msgstr "Onde se centra a distorsión por encollemento"
 
 #: src/modules/lyr_std/stroboscope.cpp:60
 msgid "Stroboscope"
-msgstr ""
+msgstr "Estroboscopio"
 
 #: src/modules/lyr_std/stroboscope.cpp:104
 msgid "Frequency"
-msgstr ""
+msgstr "Frecuencia"
 
 #: src/modules/lyr_std/stroboscope.cpp:105
 msgid "Frequency of the Strobe in times per second"
-msgstr ""
+msgstr "Frecuencia do estroboscopio en veces por segundo"
 
 #: src/modules/lyr_std/supersample.cpp:57
 msgid "Super Sample"
@@ -730,258 +741,265 @@ msgstr ""
 
 #: src/modules/lyr_std/supersample.cpp:340
 msgid "Width of sample area (In pixels)"
-msgstr ""
+msgstr "Largo da área de mostraxe (en píxeles)"
 
 #: src/modules/lyr_std/supersample.cpp:343 src/tool/printing_functions.cpp:115
 msgid "Height"
-msgstr ""
+msgstr "Altura"
 
 #: src/modules/lyr_std/supersample.cpp:344
 msgid "Height of sample area (In pixels)"
-msgstr ""
+msgstr "Alto da área de mostraxe (en píxeles)"
 
 #: src/modules/lyr_std/supersample.cpp:347
 msgid "Use Parametric"
-msgstr ""
+msgstr "Usar paramétrico"
 
 #: src/modules/lyr_std/supersample.cpp:348
 msgid "Use the Parametric Renderer"
-msgstr ""
+msgstr "Usar o renderizador paramétrico"
 
 #: src/modules/lyr_std/supersample.cpp:351
 msgid "Be Alpha Safe"
-msgstr ""
+msgstr "Estar a salvo de transparencia (alfa)"
 
 #: src/modules/lyr_std/supersample.cpp:352
 msgid "Avoid alpha artifacts when checked"
-msgstr ""
+msgstr "Evita artefactos transparentes (alfa) cando está marcado"
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
-msgstr ""
+msgstr "Bucle de tempo"
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
-msgstr ""
+msgstr "Tempo de ligazón"
 
 #: src/modules/lyr_std/timeloop.cpp:134
 msgid "Start time of the loop for the cycled context"
-msgstr ""
+msgstr "Tempo de inicio do bucle para o contexto sobre o que se aplica"
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
-msgstr ""
+msgstr "Tempo local"
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
-msgstr ""
+msgstr "O momento no que se inicia o bucle resultante"
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
-msgstr ""
+msgstr "Duración"
 
 #: src/modules/lyr_std/timeloop.cpp:146
 msgid "Lenght of the loop"
-msgstr ""
+msgstr "Lonxitude do bucle"
 
 #: src/modules/lyr_std/timeloop.cpp:151
 msgid "Only For Positive Duration"
-msgstr ""
+msgstr "Só para duración positiva"
 
 #: src/modules/lyr_std/timeloop.cpp:152
 msgid "When checked will loop only positive durations"
-msgstr ""
+msgstr "Cando está marcado, repetirase só para duracións positivas"
 
 #: src/modules/lyr_std/timeloop.cpp:157
 msgid "Symmetrical"
-msgstr ""
+msgstr "Simétrico"
 
 #: src/modules/lyr_std/timeloop.cpp:158
 msgid "When checked, loops are mirrored centered at Local Time"
-msgstr ""
+msgstr "Cando está marcado, os bucles reflíctense centrados no tempo local"
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
-msgstr ""
+msgstr "Trasladar"
 
 #: src/modules/lyr_std/twirl.cpp:56
 msgid "Twirl"
-msgstr ""
+msgstr "Remuíño"
 
 #: src/modules/lyr_std/twirl.cpp:113
 #: src/modules/mod_example/simplecircle.cpp:113
 #: src/modules/mod_geometry/circle.cpp:162
 msgid "Center of the circle"
-msgstr ""
+msgstr "Centro do círculo"
 
 #: src/modules/lyr_std/twirl.cpp:118
 #: src/modules/mod_example/simplecircle.cpp:118
 #: src/modules/mod_gradient/radialgradient.cpp:124
 #: src/modules/mod_gradient/spiralgradient.cpp:124
 msgid "This is the radius of the circle"
-msgstr ""
+msgstr "Este é o radio do círculo"
 
 #: src/modules/lyr_std/twirl.cpp:124
 msgid "Rotations"
-msgstr ""
+msgstr "Rotacións"
 
 #: src/modules/lyr_std/twirl.cpp:125
 msgid "The number of rotations of the twirl effect"
-msgstr ""
+msgstr "O número de rotacións do efecto remuíño"
 
 #: src/modules/lyr_std/twirl.cpp:131
 msgid "When checked, distorts inside the circle"
-msgstr ""
+msgstr "Cando está marcado, distorsiona o interior do círculo"
 
 #: src/modules/lyr_std/twirl.cpp:136
 msgid "When checked, distorts outside the circle"
-msgstr ""
+msgstr "Cando está marcado, distorsiona o exterior do círculo"
 
 #: src/modules/lyr_std/warp.cpp:57
 msgid "Warp"
-msgstr ""
+msgstr "Empenar"
 
 #: src/modules/lyr_std/warp.cpp:380
 msgid "Source TL"
-msgstr ""
+msgstr "Orixe SE"
 
 #: src/modules/lyr_std/warp.cpp:382
 msgid "Top Left corner of the source to warp"
-msgstr ""
+msgstr "Canto superior esquerdo da orixe a empenar"
 
 #: src/modules/lyr_std/warp.cpp:386
 msgid "Source BR"
-msgstr ""
+msgstr "Orixe ID"
 
 #: src/modules/lyr_std/warp.cpp:387
 msgid "Bottom Right corner of the source to warp"
-msgstr ""
+msgstr "Canto inferior dereito da orixe a empenar"
 
 #: src/modules/lyr_std/warp.cpp:391
 msgid "Dest TL"
-msgstr ""
+msgstr "Destino SE"
 
 #: src/modules/lyr_std/warp.cpp:393
 msgid "Top Left corner of the destination"
-msgstr ""
+msgstr "Canto superior esquerdo do destino"
 
 #: src/modules/lyr_std/warp.cpp:397
 msgid "Dest TR"
-msgstr ""
+msgstr "Destino SD"
 
 #: src/modules/lyr_std/warp.cpp:399
 msgid "Top Right corner of the destination"
-msgstr ""
+msgstr "Canto superior dereito do destino"
 
 #: src/modules/lyr_std/warp.cpp:403
 msgid "Dest BR"
-msgstr ""
+msgstr "Destino ID"
 
 #: src/modules/lyr_std/warp.cpp:405
 msgid "Bottom Right corner of the destination"
-msgstr ""
+msgstr "Canto inferior dereito do destino"
 
 #: src/modules/lyr_std/warp.cpp:409
 msgid "Dest BL"
-msgstr ""
+msgstr "Destino IE"
 
 #: src/modules/lyr_std/warp.cpp:411
 msgid "Bottom Left corner of the destination"
-msgstr ""
+msgstr "Canto inferior esquerdo do destino"
 
 #: src/modules/lyr_std/warp.cpp:419
 msgid "Horizon"
-msgstr ""
+msgstr "Horizonte"
 
 #: src/modules/lyr_std/warp.cpp:420
 msgid "Height that determines the horizon in perspectives"
-msgstr ""
+msgstr "Altura que determina o horizonte nas perspectivas"
 
 #: src/modules/lyr_std/xorpattern.cpp:55
 msgid "XOR Pattern"
-msgstr ""
+msgstr "Patrón XOR"
 
 #: src/modules/lyr_std/xorpattern.cpp:130
 msgid "Center of the pattern"
-msgstr ""
+msgstr "Centro do patrón"
 
 #: src/modules/lyr_std/xorpattern.cpp:134
 msgid "Size of the pattern"
-msgstr ""
-
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+msgstr "Tamaño do patrón"
+
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
-msgstr ""
+msgstr "Escala"
 
 #: src/modules/lyr_std/zoom.cpp:100
 msgid "Amount to scale to"
-msgstr ""
+msgstr "Cantidade a escalar para"
 
 #: src/modules/lyr_std/zoom.cpp:107
 msgid "Point to scale from"
-msgstr ""
+msgstr "Punto descd o que escalar"
 
 #: src/modules/mod_bmp/mptr_bmp.cpp:132 src/modules/mod_bmp/mptr_bmp.cpp:133
 #: src/modules/mod_ppm/mptr_ppm.cpp:70
 #, c-format
 msgid "Unable to open %s"
-msgstr ""
+msgstr "Non é posíbel abrir %s"
 
 #: src/modules/mod_bmp/mptr_bmp.cpp:144 src/modules/mod_bmp/mptr_bmp.cpp:145
 #, c-format
 msgid "%s is not in BMP format"
-msgstr ""
+msgstr "%s non está no formato BMP"
 
 #: src/modules/mod_bmp/mptr_bmp.cpp:151
 #, c-format
 msgid "Failure while reading BITMAP::FILEHEADER from %s"
-msgstr ""
+msgstr "Produciuse un fallo ao ler BITMAP::FILEHEADER desde %s"
 
 #: src/modules/mod_bmp/mptr_bmp.cpp:159
 #, c-format
 msgid "Failure while reading BITMAP::INFOHEADER from %s"
-msgstr ""
+msgstr "Produciuse un fallo ao ler BITMAP::INFOHEADER desde %s"
 
 #: src/modules/mod_bmp/mptr_bmp.cpp:169
 #, c-format
 msgid "Bad BITMAP::FILEHEADER in %s. (bfOffsetBits=%d, should be %d)"
-msgstr ""
+msgstr "BITMAP::FILEHEADER incorrecto en %s. (bfOffsetBits=%d, debería ser %d)"
 
 #: src/modules/mod_bmp/mptr_bmp.cpp:177
 #, c-format
 msgid "Bad BITMAP::INFOHEADER in %s. (biSize=%d, should be %d)"
-msgstr ""
+msgstr "BITMAP::INFOHEADER incorrecto en %s. (biSize=%d, debería ser %d)"
 
 #: src/modules/mod_bmp/mptr_bmp.cpp:195 src/modules/mod_bmp/mptr_bmp.cpp:196
 msgid "Reading compressed bitmaps is not supported"
-msgstr ""
+msgstr "A lectura de bitmaps compactados non é compatíbel"
 
 #: src/modules/mod_bmp/mptr_bmp.cpp:202 src/modules/mod_bmp/mptr_bmp.cpp:203
 #, c-format
 msgid "Unsupported bit depth (bit_count=%d, should be 24 or 32)"
 msgstr ""
+"Profundidade de bits non compatíbel (bit_count=%d, debería ser 24 ou 32)"
 
 #: src/modules/mod_bmp/trgt_bmp.cpp:187
 msgid " (animated)"
-msgstr ""
+msgstr " (animado)"
 
 #: src/modules/mod_bmp/trgt_bmp.cpp:197 src/modules/mod_bmp/trgt_bmp.cpp:198
 msgid "Unable to open file"
-msgstr ""
+msgstr "Non é posíbel abrir o ficheiro"
 
 #: src/modules/mod_bmp/trgt_bmp.cpp:228 src/modules/mod_bmp/trgt_bmp.cpp:229
 msgid "Unable to write file header to file"
-msgstr ""
+msgstr "Non é posíbel escribir a cabeceira de ficheiro no ficheiro"
 
 #: src/modules/mod_bmp/trgt_bmp.cpp:235 src/modules/mod_bmp/trgt_bmp.cpp:236
 msgid "Unable to write info header"
-msgstr ""
+msgstr "Non é posíbel escribir a cabeceira de información"
 
 #: src/modules/mod_dv/trgt_dv.cpp:164 src/modules/mod_dv/trgt_dv.cpp:173
 #: src/modules/mod_dv/trgt_dv.cpp:180 src/modules/mod_dv/trgt_dv.cpp:190
@@ -989,71 +1007,73 @@ msgstr ""
 #: src/modules/mod_dv/trgt_dv.cpp:207 src/modules/mod_dv/trgt_dv.cpp:216
 #: src/modules/mod_dv/trgt_dv.cpp:225
 msgid "Unable to open pipe to encodedv"
-msgstr ""
+msgstr "Non é posíbel abrir a canalización para «encodev»"
 
 #: src/modules/mod_example/filledrect.cpp:59
 msgid "Filled Rectangle"
-msgstr ""
+msgstr "Rectángulo recheo"
 
 #: src/modules/mod_example/filledrect.cpp:60
 #: src/modules/mod_example/metaballs.cpp:58
 #: src/modules/mod_example/simplecircle.cpp:58
 msgid "Example"
-msgstr ""
+msgstr "Exemplo"
 
 #: src/modules/mod_example/filledrect.cpp:132
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
-msgstr ""
+msgstr "Cor de recheo da capa"
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
-msgstr ""
+msgstr "Punto 1"
 
 #: src/modules/mod_example/filledrect.cpp:137
 #: src/modules/mod_geometry/rectangle.cpp:145
 msgid "First corner of the rectangle"
-msgstr ""
+msgstr "Primeiro canto do rectángulo"
 
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
-msgstr ""
+msgstr "Punto 2"
 
 #: src/modules/mod_example/filledrect.cpp:143
 #: src/modules/mod_geometry/rectangle.cpp:150
 msgid "Second corner of the rectangle"
-msgstr ""
+msgstr "segundo canto do rectángulo"
 
 #: src/modules/mod_example/filledrect.cpp:147
 msgid "Feather X"
-msgstr ""
+msgstr "Esvaecemento X"
 
 #: src/modules/mod_example/filledrect.cpp:152
 msgid "Feather Y"
-msgstr ""
+msgstr "Esvaecemento Y"
 
 #: src/modules/mod_example/filledrect.cpp:158
 msgid "Use Bevel for the corners"
-msgstr ""
+msgstr "Usar bisel nos cantos"
 
 #: src/modules/mod_example/filledrect.cpp:163
 msgid "Keep Bevel Circular"
-msgstr ""
+msgstr "Manter bisel circular"
 
 #: src/modules/mod_example/filledrect.cpp:164
 msgid "When checked the bevel is circular"
-msgstr ""
+msgstr "Cando está marcado o bisel é circular"
 
 #: src/modules/mod_example/metaballs.cpp:57
 msgid "Metaballs"
-msgstr ""
+msgstr "Metaballs"
 
 #: src/modules/mod_example/metaballs.cpp:129
 #: src/modules/mod_gradient/conicalgradient.cpp:109
@@ -1062,39 +1082,39 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
-msgstr ""
+msgstr "Degradado"
 
 #: src/modules/mod_example/metaballs.cpp:133
 msgid "Balls"
-msgstr ""
+msgstr "Bolas"
 
 #: src/modules/mod_example/metaballs.cpp:137
 msgid "Radii"
-msgstr ""
+msgstr "Radios"
 
 #: src/modules/mod_example/metaballs.cpp:141
 msgid "Weights"
-msgstr ""
+msgstr "Pesos"
 
 #: src/modules/mod_example/metaballs.cpp:145
 msgid "Gradient Left"
-msgstr ""
+msgstr "Degradado esquerdo"
 
 #: src/modules/mod_example/metaballs.cpp:149
 msgid "Gradient Right"
-msgstr ""
+msgstr "Degradado dereito"
 
 #: src/modules/mod_example/metaballs.cpp:153
 msgid "Positive Only"
-msgstr ""
+msgstr "Só positivo"
 
 #: src/modules/mod_example/simplecircle.cpp:57
 msgid "Simple Circle"
-msgstr ""
+msgstr "Círculo simple"
 
 #: src/modules/mod_ffmpeg/trgt_ffmpeg.cpp:207
 msgid ""
@@ -1102,117 +1122,123 @@ msgid ""
 "\n"
 "Please install \"ffmpeg\" or \"avconv\" (libav-tools package)."
 msgstr ""
+"Erro: Non se atopou ningún binario FFmpeg.\n"
+"\n"
+"Instale «ffmpeg» ou «avconv» (paquete libav-tools)."
 
 #: src/modules/mod_ffmpeg/trgt_ffmpeg.cpp:279
 msgid "Unable to open pipe to ffmpeg (no pipe)"
-msgstr ""
+msgstr "Non é posíbel abrir a canalización para «ffmpeg» (sen canalización»"
 
 #: src/modules/mod_ffmpeg/trgt_ffmpeg.cpp:286
 msgid "Unable to open pipe to ffmpeg (pid == -1)"
-msgstr ""
+msgstr "Non é posíbel abrir a canalización para «ffmpeg» (pid == -1)"
 
 #: src/modules/mod_ffmpeg/trgt_ffmpeg.cpp:296
 msgid "Unable to open pipe to ffmpeg (dup2( p[0], STDIN_FILENO ) == -1)"
 msgstr ""
+"Non é posíbel abrir a canalización para «ffmpeg» (dup2( p[0], STDIN_FILENO ) "
+"== -1)"
 
 #: src/modules/mod_ffmpeg/trgt_ffmpeg.cpp:318
 msgid "Unable to open pipe to ffmpeg (exec failed)"
-msgstr ""
+msgstr "Non é posíbel abrir a canalización para «ffmpeg» (fallou a execución)"
 
 #: src/modules/mod_ffmpeg/trgt_ffmpeg.cpp:336
 msgid "Unable to open pipe to ffmpeg (no file)"
-msgstr ""
+msgstr "Non é posíbel abrir a canalización para «ffmpeg» (non hai ficheiro)"
 
 #: src/modules/mod_filter/blur.cpp:69
 msgid "Blur"
-msgstr ""
+msgstr "Desenfoque"
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
-msgstr ""
+msgstr "Desenfoques"
 
 #: src/modules/mod_filter/blur.cpp:416
 msgid "Size of Blur"
-msgstr ""
+msgstr "Tamaño do desenfoque"
 
 #: src/modules/mod_filter/colorcorrect.cpp:56
 msgid "Color Correct"
-msgstr ""
+msgstr "Corrección da cor"
 
 #: src/modules/mod_filter/colorcorrect.cpp:217
 msgid "Hue Adjust"
-msgstr ""
+msgstr "Axuste de matiz"
 
 #: src/modules/mod_filter/colorcorrect.cpp:221
 msgid "Brightness"
-msgstr ""
+msgstr "Brillo"
 
 #: src/modules/mod_filter/colorcorrect.cpp:225
 msgid "Contrast"
-msgstr ""
+msgstr "Contraste"
 
 #: src/modules/mod_filter/colorcorrect.cpp:229
 msgid "Exposure Adjust"
-msgstr ""
+msgstr "Axuste da exposición"
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
-msgstr ""
+msgstr "Axuste de Gamma"
 
 #: src/modules/mod_filter/halftone2.cpp:59
 msgid "Halftone 2"
-msgstr ""
+msgstr "Semitón 2"
 
 #: src/modules/mod_filter/halftone2.cpp:155
 msgid "Mask Origin"
-msgstr ""
+msgstr "Orixe da máscara"
 
 #: src/modules/mod_filter/halftone2.cpp:159
 msgid "Mask Angle"
-msgstr ""
+msgstr "Ángulo da máscara"
 
 #: src/modules/mod_filter/halftone2.cpp:163
 #: src/modules/mod_filter/halftone3.cpp:328
 msgid "Mask Size"
-msgstr ""
+msgstr "Tamaño da máscara"
 
 #: src/modules/mod_filter/halftone2.cpp:168
 msgid "Light Color"
-msgstr ""
+msgstr "Cor claro"
 
 #: src/modules/mod_filter/halftone2.cpp:171
 msgid "Dark Color"
-msgstr ""
+msgstr "Cor escuro"
 
 #: src/modules/mod_filter/halftone2.cpp:176
 #: src/modules/mod_filter/halftone3.cpp:333
 #: src/modules/mod_gradient/conicalgradient.cpp:125
 msgid "Symmetric"
-msgstr ""
+msgstr "Simétrico"
 
 #: src/modules/mod_filter/halftone2.cpp:177
 #: src/modules/mod_filter/halftone3.cpp:334
 msgid "Light On Dark"
-msgstr ""
+msgstr "Claroscuro"
 
 #: src/modules/mod_filter/halftone2.cpp:179
 #: src/modules/mod_filter/halftone3.cpp:336
 msgid "Diamond"
-msgstr ""
+msgstr "Diamante"
 
 #: src/modules/mod_filter/halftone2.cpp:180
 #: src/modules/mod_filter/halftone3.cpp:337
 msgid "Stripe"
-msgstr ""
+msgstr "Raia"
 
 #: src/modules/mod_filter/halftone3.cpp:59
 msgid "Halftone 3"
-msgstr ""
+msgstr "Semitón 3"
 
 #: src/modules/mod_filter/halftone3.cpp:331
 msgid " Type"
-msgstr ""
+msgstr " Tipo"
 
 #: src/modules/mod_filter/halftone3.cpp:340
 msgid "Subtractive Flag"
@@ -1220,35 +1246,35 @@ msgstr ""
 
 #: src/modules/mod_filter/halftone3.cpp:348
 msgid " Color"
-msgstr ""
+msgstr " Cor"
 
 #: src/modules/mod_filter/halftone3.cpp:352
 msgid " Mask Origin"
-msgstr ""
+msgstr " Orixe da máscara"
 
 #: src/modules/mod_filter/halftone3.cpp:356
 msgid " Mask Angle"
-msgstr ""
+msgstr " Ángulo da máscara"
 
 #: src/modules/mod_filter/lumakey.cpp:59
 msgid "Luma Key"
-msgstr ""
+msgstr "Clave de luminancia"
 
 #: src/modules/mod_filter/radialblur.cpp:56
 msgid "Radial Blur"
-msgstr ""
+msgstr "Desenfoque Radial"
 
 #: src/modules/mod_filter/radialblur.cpp:116
 msgid "Size of blur"
-msgstr ""
+msgstr "Tamaño do desenfoque"
 
 #: src/modules/mod_filter/radialblur.cpp:121
 msgid "Fade Out"
-msgstr ""
+msgstr "Esvaecer"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:67
 msgid "Advanced Outline"
-msgstr ""
+msgstr "Contorno avanzado"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:68
 #: src/modules/mod_geometry/checkerboard.cpp:59
@@ -1256,13 +1282,14 @@ msgstr ""
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
-msgstr ""
+msgstr "Xeometría"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:152
 msgid "No vertices in spline "
-msgstr ""
+msgstr "Sen vértices na Spline"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1136
 #: src/modules/mod_geometry/outline.cpp:826
@@ -1270,248 +1297,256 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:562
 #: src/modules/mod_particle/plant.cpp:425
 msgid "A list of spline points"
-msgstr ""
+msgstr "Unha lista de puntos Spline"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1140
 #: src/modules/mod_geometry/outline.cpp:840
 msgid "Outline Width"
-msgstr ""
+msgstr "Largura do contorno"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1141
 #: src/modules/mod_geometry/outline.cpp:841
 msgid "Global width of the outline"
-msgstr ""
+msgstr "Largura global do contorno"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1145
 #: src/modules/mod_geometry/outline.cpp:846
 msgid "Expand"
-msgstr ""
+msgstr "Expandir"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1146
 #: src/modules/mod_geometry/outline.cpp:847
 msgid "Value to add to the global width"
-msgstr ""
+msgstr "Valor a engadir ao largo global"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1149
 msgid "Tip Type at Start"
-msgstr ""
+msgstr "Tipo de punta no inicio"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1150
 msgid "Defines the Tip type of the first spline point when spline is unlooped"
 msgstr ""
+"Define o tipo de punta do primeiro vértice do contorno cando está aberto"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
-msgstr ""
+msgstr "Parada arredondada"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
-msgstr ""
+msgstr "Parada cadrada"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
-msgstr ""
+msgstr "Parada en pico"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
-msgstr ""
+msgstr "Parada plana"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1158
 msgid "Tip Type at End"
-msgstr ""
+msgstr "Tipo de punta na fin"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1159
 msgid "Defines the Tip type of the last spline point when spline is unlooped"
-msgstr ""
+msgstr "Define o tipo de punta do último vértice do contorno cando está aberto"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1167
 msgid "Cusps Type"
-msgstr ""
+msgstr "Tipo de cúspide"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1168
 #: src/modules/mod_geometry/outline.cpp:852
 msgid "Determines cusp type"
-msgstr ""
+msgstr "Determina o aspecto dos ángulos"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1170
 msgid "Sharp"
-msgstr ""
+msgstr "Afiado"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1171
 msgid "Rounded"
-msgstr ""
+msgstr "Arredondado"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1175
 msgid "Smoothness"
-msgstr ""
+msgstr "Suavizado"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+#, fuzzy
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
+"Determina a interpolación entre os puntos de largura. (0) Lineal (1) Suave"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
-msgstr ""
+msgstr "Homoxéneo"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1180
 msgid "When true, widthpoints positions are spline length based"
 msgstr ""
+"Cando é verdadeiro, as posicións dos puntos de largura baséanse na lonxitude "
+"da Spline"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1183
 msgid "Width Point List"
-msgstr ""
+msgstr "Lista de puntos de largura"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1186
 msgid "List of width Points that defines the variable width"
-msgstr ""
+msgstr "Lista de puntos de largura que define a largura variábel"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1190
 msgid "When checked outline renders faster, but less accurate"
 msgstr ""
+"Cando está marcado, o contorno amosase máis rápido, mais con menor precisión"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1193
 msgid "Dashed Outline"
-msgstr ""
+msgstr "Contorno trazado"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1195
 msgid "When checked outline is dashed"
-msgstr ""
+msgstr "Cando está marcado, o contorno usa guións"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1198
 msgid "Dash Item List"
-msgstr ""
+msgstr "Lista de elementos guión"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1201
 msgid "List of dash items that defines the dashed outline"
-msgstr ""
+msgstr "Lista de elementos de guión que define o contorno que usa guións"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1204
 msgid "Dash Items Offset"
-msgstr ""
+msgstr "Desprazamento dos elementos guión"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1207
 msgid "Distance to Offset the Dash Items"
-msgstr ""
+msgstr "Distancia a desprazar os elementos guión"
 
 #: src/modules/mod_geometry/checkerboard.cpp:58
 msgid "Checkerboard"
-msgstr ""
+msgstr "Taboleiro de xaderz"
 
 #: src/modules/mod_geometry/checkerboard.cpp:147
 msgid "Color of checkers"
-msgstr ""
+msgstr "Cor das casas"
 
 #: src/modules/mod_geometry/checkerboard.cpp:151
 msgid "Center of the checkers"
-msgstr ""
+msgstr "Centro das casas"
 
 #: src/modules/mod_geometry/checkerboard.cpp:155
 msgid "Size of checkers"
-msgstr ""
+msgstr "Tamaño das casas"
 
 #: src/modules/mod_geometry/circle.cpp:56
 msgid "Circle"
-msgstr ""
+msgstr "Círculo"
 
 #: src/modules/mod_geometry/circle.cpp:152
 msgid "Radius of the circle"
-msgstr ""
+msgstr "Radio do círculo"
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
-msgstr ""
+msgstr "Esvaecemento"
 
 #: src/modules/mod_geometry/circle.cpp:158
 msgid "Amount of feather of the circle"
-msgstr ""
+msgstr "Cantidade de esvaecemento do círculo"
 
 #: src/modules/mod_geometry/circle.cpp:166
 msgid "Invert the circle"
-msgstr ""
+msgstr "Inverter o círculo"
 
 #: src/modules/mod_geometry/circle.cpp:170
 msgid "Falloff"
-msgstr ""
+msgstr "Atenuación"
 
 #: src/modules/mod_geometry/circle.cpp:171
 msgid "Determines the falloff function for the feather"
-msgstr ""
+msgstr "Determina a función de atenuación para o esvaecemento"
 
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
-msgstr ""
+msgstr "Lineal"
 
 #: src/modules/mod_geometry/circle.cpp:174
 msgid "Squared"
-msgstr ""
+msgstr "Cadrado"
 
 #: src/modules/mod_geometry/circle.cpp:175
 msgid "Square Root"
-msgstr ""
+msgstr "Raíz cadrada"
 
 #: src/modules/mod_geometry/circle.cpp:176
 msgid "Sigmond"
-msgstr ""
+msgstr "Sigmoide"
 
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
-msgstr ""
+msgstr "Coseno"
 
 #: src/modules/mod_geometry/outline.cpp:72
 msgid "Outline"
-msgstr ""
+msgstr "Contorno"
 
 #: src/modules/mod_geometry/outline.cpp:192
 msgid "No vertices in outline "
-msgstr ""
+msgstr "Sen vértices no contorno"
 
 #: src/modules/mod_geometry/outline.cpp:851
 msgid "Sharp Cusps"
-msgstr ""
+msgstr "Cúspides afiadas"
 
 #: src/modules/mod_geometry/outline.cpp:856
 msgid "Rounded Begin"
-msgstr ""
+msgstr "Comezo arredondado"
 
 #: src/modules/mod_geometry/outline.cpp:857
 #: src/modules/mod_geometry/outline.cpp:862
 msgid "Round off the tip"
-msgstr ""
+msgstr "Arredondado da punta"
 
 #: src/modules/mod_geometry/outline.cpp:861
 msgid "Rounded End"
-msgstr ""
+msgstr "Fin arredondado"
 
 #: src/modules/mod_geometry/outline.cpp:865
 msgid "Loopyness"
@@ -1519,89 +1554,92 @@ msgstr ""
 
 #: src/modules/mod_geometry/outline.cpp:866
 msgid "(Currently not used)"
-msgstr ""
+msgstr "(non utilizado actualmente)"
 
 #: src/modules/mod_geometry/outline.cpp:870
 msgid "When checked the width takes the length of the spline to interpolate"
 msgstr ""
+"Cando está marcado, o largo emprega a lonxitude da Spline para interpolar"
 
 #: src/modules/mod_geometry/rectangle.cpp:59
 msgid "Rectangle"
-msgstr ""
+msgstr "Rectángulo"
 
 #: src/modules/mod_geometry/rectangle.cpp:155
 msgid "Expand amount"
-msgstr ""
+msgstr "Cantidade de expansión"
 
 #: src/modules/mod_geometry/rectangle.cpp:159
 msgid "Invert the rectangle"
-msgstr ""
+msgstr "Inverter o rectángulo"
 
 #: src/modules/mod_geometry/region.cpp:64
 msgid "Region"
-msgstr ""
+msgstr "Área"
 
 #: src/modules/mod_geometry/star.cpp:63
 msgid "Star"
-msgstr ""
+msgstr "Estrela"
 
 #: src/modules/mod_geometry/star.cpp:170
 msgid "Outer Radius"
-msgstr ""
+msgstr "Radio externo"
 
 #: src/modules/mod_geometry/star.cpp:171
 msgid "The radius of the outer points in the star"
-msgstr ""
+msgstr "O radio dos puntos exteriores na estrela"
 
 #: src/modules/mod_geometry/star.cpp:177
 msgid "Inner Radius"
-msgstr ""
+msgstr "Radio interno"
 
 #: src/modules/mod_geometry/star.cpp:178
 msgid "The radius of the inner points in the star"
-msgstr ""
+msgstr "O radio dos puntos interiores na estrela"
 
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
-msgstr ""
+msgstr "Ángulo"
 
 #: src/modules/mod_geometry/star.cpp:185
 msgid "The orientation of the star"
-msgstr ""
+msgstr "A orientación da estrela"
 
 #: src/modules/mod_geometry/star.cpp:190 src/synfig/distance.cpp:260
 msgid "Points"
-msgstr ""
+msgstr "Puntos"
 
 #: src/modules/mod_geometry/star.cpp:191
 msgid "The number of points in the star"
-msgstr ""
+msgstr "O número de puntos na estrela"
 
 #: src/modules/mod_geometry/star.cpp:195
 msgid "Regular Polygon"
-msgstr ""
+msgstr "Polígono regular"
 
 #: src/modules/mod_geometry/star.cpp:196
 msgid "Whether to draw a star or a regular polygon"
-msgstr ""
+msgstr "Se debuxa un polígono regular ou unha estrela"
 
 #: src/modules/mod_gif/trgt_gif.cpp:112
 #, c-format
 msgid "Unable to open \"%s\" for write access!"
-msgstr ""
+msgstr "Non foi posíbel abrir «%s» con acceso de escritura!"
 
 #: src/modules/mod_gif/trgt_gif.cpp:200
 msgid "Description not set!"
-msgstr ""
+msgstr "Sen definir a descrición!"
 
 #: src/modules/mod_gradient/conicalgradient.cpp:57
 msgid "Conical Gradient"
-msgstr ""
+msgstr "Degradado cónico"
 
 #: src/modules/mod_gradient/conicalgradient.cpp:58
 #: src/modules/mod_gradient/curvegradient.cpp:62
@@ -1610,7 +1648,7 @@ msgstr ""
 #: src/modules/mod_gradient/spiralgradient.cpp:58
 #: src/modules/mod_noise/noise.cpp:59
 msgid "Gradients"
-msgstr ""
+msgstr "Degradados"
 
 #: src/modules/mod_gradient/conicalgradient.cpp:110
 #: src/modules/mod_gradient/curvegradient.cpp:566
@@ -1619,446 +1657,466 @@ msgstr ""
 #: src/modules/mod_gradient/spiralgradient.cpp:114
 #: src/modules/mod_noise/noise.cpp:269
 msgid "Gradient to apply"
-msgstr ""
+msgstr "Degradado que aplicar"
 
 #: src/modules/mod_gradient/conicalgradient.cpp:115
 msgid "Center of the cone"
-msgstr ""
+msgstr "Centro do cono"
 
 #: src/modules/mod_gradient/conicalgradient.cpp:121
 msgid "Rotation of the gradient around the center"
-msgstr ""
+msgstr "Rotación do degradado arredor do centro"
 
 #: src/modules/mod_gradient/conicalgradient.cpp:126
 #: src/modules/mod_gradient/curvegradient.cpp:570
 #: src/modules/mod_gradient/lineargradient.cpp:204
 #: src/modules/mod_gradient/radialgradient.cpp:131
 msgid "When checked the gradient is looped"
-msgstr ""
+msgstr "Cando está marcado, péchase o degradado"
 
 #: src/modules/mod_gradient/curvegradient.cpp:61
 msgid "Curve Gradient"
-msgstr ""
+msgstr "Degradado curvo"
 
 #: src/modules/mod_gradient/curvegradient.cpp:551
 #: src/modules/mod_particle/plant.cpp:432
 msgid "Offset for the Vertices List"
-msgstr ""
+msgstr "Desprazamento da lista de vértices"
 
 #: src/modules/mod_gradient/curvegradient.cpp:556
 msgid "Global width of the gradient"
-msgstr ""
+msgstr "Largura global do degradado"
 
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
-msgstr ""
+msgstr "Bucle"
 
 #: src/modules/mod_gradient/curvegradient.cpp:573
 #: src/modules/mod_gradient/lineargradient.cpp:207
 #: src/modules/mod_gradient/radialgradient.cpp:135
 msgid "ZigZag"
-msgstr ""
+msgstr "Zigzag"
 
 #: src/modules/mod_gradient/curvegradient.cpp:574
 #: src/modules/mod_gradient/lineargradient.cpp:208
 #: src/modules/mod_gradient/radialgradient.cpp:136
 msgid "When checked the gradient is symmetrical at the center"
-msgstr ""
+msgstr "Cando está marcado, o degradado é simétrico ao centro"
 
 #: src/modules/mod_gradient/curvegradient.cpp:577
 msgid "Perpendicular"
-msgstr ""
+msgstr "Perpendicular"
 
 #: src/modules/mod_gradient/lineargradient.cpp:54
 msgid "Linear Gradient"
-msgstr ""
+msgstr "Degradado lineal"
 
 #: src/modules/mod_gradient/lineargradient.cpp:192
 msgid "Start point of the gradient"
-msgstr ""
+msgstr "Punto inicial do degradado"
 
 #: src/modules/mod_gradient/lineargradient.cpp:196
 msgid "End point of the gradient"
-msgstr ""
+msgstr "Punto final do degradado"
 
 #: src/modules/mod_gradient/radialgradient.cpp:57
 msgid "Radial Gradient"
-msgstr ""
+msgstr "Degradado radial"
 
 #: src/modules/mod_gradient/radialgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:119
 msgid "Center of the gradient"
-msgstr ""
+msgstr "Centro do degradado"
 
 #: src/modules/mod_gradient/spiralgradient.cpp:57
 msgid "Spiral Gradient"
-msgstr ""
+msgstr "Degradado espiral"
 
 #: src/modules/mod_gradient/spiralgradient.cpp:131
 msgid "Rotation of the spiral"
-msgstr ""
+msgstr "Rotación da espiral"
 
 #: src/modules/mod_gradient/spiralgradient.cpp:136
 msgid "Clockwise"
-msgstr ""
+msgstr "Cara a dereita"
 
 #: src/modules/mod_gradient/spiralgradient.cpp:137
 msgid "When checked the spiral turns clockwise"
-msgstr ""
+msgstr "Cando está marcado a espiral xira cara a dereita"
 
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:105
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:106
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:238
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:239
 msgid "No file to load"
-msgstr ""
+msgstr "Non hai ficheiro que cargar"
 
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:119
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:120
 msgid "Cannot create temporary file of "
-msgstr ""
+msgstr "Non é posíbel crear o ficheiro temporal de "
 
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:179
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:180
 #: src/synfig/cairolistimporter.cpp:194 src/synfig/cairolistimporter.cpp:195
 #: src/synfig/listimporter.cpp:189 src/synfig/listimporter.cpp:190
 msgid "Unable to open "
-msgstr ""
+msgstr "Non é posíbel abrir "
 
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:186
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:187
 #: src/synfig/cairolistimporter.cpp:201 src/synfig/cairolistimporter.cpp:202
 #: src/synfig/listimporter.cpp:196 src/synfig/listimporter.cpp:197
 msgid "Unable to get frame from "
-msgstr ""
+msgstr "Non é posíbel obter o fotograma desde "
 
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:193
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:194
 msgid "Bad surface from "
-msgstr ""
+msgstr "Superficie defectuosa desde "
 
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:249
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:250
 msgid "Unable to open pipe to imagemagick"
-msgstr ""
+msgstr "Non é posíbel abrir a canalización a imagemagick"
 
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:261
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:262
 msgid "Reached end of stream without finding PPM header"
-msgstr ""
+msgstr "Acadada a fin do fluxo sen atopar a cabeceira PPM"
 
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:270
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:271
 msgid "stream not in PPM format"
-msgstr ""
+msgstr "o fluxo non está no formato PPM"
 
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:282
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:283
 msgid "Premature end of file (after header)"
-msgstr ""
+msgstr "Fin de ficheiro prematura (após a cabeceira)"
 
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:295
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:296
 msgid "Premature end of file"
-msgstr ""
+msgstr "Fin de ficheiro prematura"
 
 #: src/modules/mod_imagemagick/trgt_imagemagick.cpp:157
 msgid "Unable to open pipe to imagemagick's convert utility"
 msgstr ""
+"Non é posíbel abrir a canalización cara a ferramenta de conversión "
+"imagemagick"
 
 #: src/modules/mod_noise/distort.cpp:58
 msgid "Noise Distort"
-msgstr ""
+msgstr "Distorsión de ruído"
 
 #: src/modules/mod_noise/distort.cpp:222
 msgid "Displacement"
-msgstr ""
+msgstr "Desprazamento"
 
 #: src/modules/mod_noise/distort.cpp:223
 msgid "How big the distortion displaces the context"
-msgstr ""
+msgstr "Como de grande é a distorsión que despraza o contexto"
 
 #: src/modules/mod_noise/distort.cpp:228
 msgid "The distance between distortions"
-msgstr ""
+msgstr "A distancia entre distorsións"
 
 #: src/modules/mod_noise/distort.cpp:231 src/modules/mod_noise/noise.cpp:272
 msgid "RandomNoise Seed"
-msgstr ""
+msgstr "Semente de ruído ao chou"
 
 #: src/modules/mod_noise/distort.cpp:232 src/modules/mod_noise/noise.cpp:273
 msgid "Change to modify the random seed of the noise"
-msgstr ""
+msgstr "Cambie para modificar a semente ao chou para o ruído"
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
-msgstr ""
+msgstr "Interpolación"
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
-msgstr ""
+msgstr "Que tipo de interpolación usar"
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
-msgstr ""
+msgstr "Veciño máis preto"
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
-msgstr ""
+msgstr "Spline"
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
-msgstr ""
+msgstr "Cubico"
 
 #: src/modules/mod_noise/distort.cpp:245 src/modules/mod_noise/noise.cpp:290
 msgid "Detail"
-msgstr ""
+msgstr "Detalle"
 
 #: src/modules/mod_noise/distort.cpp:246 src/modules/mod_noise/noise.cpp:291
 msgid "Increase to obtain fine details of the noise"
-msgstr ""
+msgstr "Aumentar para obter detalles finos do ruído"
 
 #: src/modules/mod_noise/distort.cpp:249 src/modules/mod_noise/noise.cpp:294
 msgid "Animation Speed"
-msgstr ""
+msgstr "Velocidade da animación"
 
 #: src/modules/mod_noise/distort.cpp:250 src/modules/mod_noise/noise.cpp:295
 msgid "In cycles per second"
-msgstr ""
+msgstr "En ciclos por segundo"
 
 #: src/modules/mod_noise/distort.cpp:253 src/modules/mod_noise/noise.cpp:298
 msgid "Turbulent"
-msgstr ""
+msgstr "Turbulento"
 
 #: src/modules/mod_noise/distort.cpp:254 src/modules/mod_noise/noise.cpp:299
 msgid "When checked produces turbulent noise"
-msgstr ""
+msgstr "Cando está marcado, produce un ruído turbulento"
 
 #: src/modules/mod_noise/main.cpp:66
 #: src/modules/mod_noise/valuenode_random.cpp:169
 msgid "Random"
-msgstr ""
+msgstr "Ao chou"
 
 #: src/modules/mod_noise/noise.cpp:58
 msgid "Noise Gradient"
-msgstr ""
+msgstr "Degradado ruídoso"
 
 #: src/modules/mod_noise/noise.cpp:277
 msgid "Size of the noise"
-msgstr ""
+msgstr "Tamaño do ruído"
 
 #: src/modules/mod_noise/noise.cpp:302
 msgid "Do Alpha"
-msgstr ""
+msgstr "Facer transparente (alfa)"
 
 #: src/modules/mod_noise/noise.cpp:303
 msgid "Uses transparency"
-msgstr ""
+msgstr "Usar transparencia"
 
 #: src/modules/mod_noise/noise.cpp:306
 msgid "Super Sampling"
-msgstr ""
+msgstr "Super mostraxe"
 
 #: src/modules/mod_noise/noise.cpp:307
 msgid "When checked the gradient is supersampled"
-msgstr ""
+msgstr "Cando está marcado, o degradado é sobremostrado"
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
-msgstr ""
+msgstr "Ligazón"
 
 #: src/modules/mod_noise/valuenode_random.cpp:251
 msgid "The value node source that provides the central value"
-msgstr ""
+msgstr "O valor do nodo orixe que fornece o valor central"
 
 #: src/modules/mod_noise/valuenode_random.cpp:256
 msgid "The value of the maximum random difference"
-msgstr ""
+msgstr "O valor da diferencia máxima ao chou"
 
 #: src/modules/mod_noise/valuenode_random.cpp:260
 #: src/modules/mod_particle/plant.cpp:483
 msgid "Seed"
-msgstr ""
+msgstr "Semente"
 
 #: src/modules/mod_noise/valuenode_random.cpp:261
 msgid "Seeds the random number generator"
-msgstr ""
+msgstr "Sementa o xerador de números ao chou"
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
-msgstr ""
+msgstr "Velocidade"
 
 #: src/modules/mod_noise/valuenode_random.cpp:266
 msgid "Defines how often a new random value is chosen (in choices per second) "
 msgstr ""
+"Define con que frecuencia se escolle ao chou un valor novo (en escollas por "
+"segundo) "
 
 #: src/modules/mod_noise/valuenode_random.cpp:271
 msgid ""
 "Determines how the value is interpolated from one random choice to the next"
 msgstr ""
+"Determina como é interpolado o valor entre unha escolla ao chou e a seguinte"
 
 #: src/modules/mod_noise/valuenode_random.cpp:273
 msgid "No interpolation"
-msgstr ""
+msgstr "Sen interpolación"
 
 #: src/modules/mod_noise/valuenode_random.cpp:282
 msgid "Loop Time"
-msgstr ""
+msgstr "Tempo do bucle"
 
 #: src/modules/mod_noise/valuenode_random.cpp:283
 msgid "Makes the random value repeat after the given time"
-msgstr ""
+msgstr "Fai que se repita o valor ao chou após un tempo dado"
 
 #: src/modules/mod_particle/plant.cpp:70
 msgid "Plant"
-msgstr ""
+msgstr "Planta"
 
 #: src/modules/mod_particle/plant.cpp:437
 msgid "Gradient to be used for coloring the plant"
-msgstr ""
+msgstr "Degradado que usar para colorear a planta"
 
 #: src/modules/mod_particle/plant.cpp:441
 msgid "Split Angle"
-msgstr ""
+msgstr "Ángulo de división"
 
 #: src/modules/mod_particle/plant.cpp:442
 msgid "Angle by which each split deviates from its parent"
-msgstr ""
+msgstr "Ángulo co que cada división se desvía da súa predecesora"
 
 #: src/modules/mod_particle/plant.cpp:446
 msgid "Gravity"
-msgstr ""
+msgstr "Gravidade"
 
 #: src/modules/mod_particle/plant.cpp:447
 msgid "Direction in which the shoots tend to face"
-msgstr ""
+msgstr "Dirección na que tenden a medrar as polas"
 
 #: src/modules/mod_particle/plant.cpp:452
 msgid "Tangential Velocity"
-msgstr ""
+msgstr "Velocidade tanxencial"
 
 #: src/modules/mod_particle/plant.cpp:453
 msgid "Amount to which shoots tend to grow along the tangent to the spline"
-msgstr ""
+msgstr "Cantidade que tenden a medrar as polas na dirección tanxente á Spline"
 
 #: src/modules/mod_particle/plant.cpp:457
 msgid "Perpendicular Velocity"
-msgstr ""
+msgstr "Velocidade perpendicular"
 
 #: src/modules/mod_particle/plant.cpp:458
 msgid ""
 "Amount to which shoots tend to grow perpendicular to the tangent to the "
 "spline"
 msgstr ""
+"Cantidade que tenden a medrar as polas na dirección perpendicular á Spline"
 
 #: src/modules/mod_particle/plant.cpp:462
 msgid "Stem Size"
-msgstr ""
+msgstr "Tamaño do talo"
 
 #: src/modules/mod_particle/plant.cpp:463
 msgid "Size of the stem"
-msgstr ""
+msgstr "Tamaño do talo"
 
 #: src/modules/mod_particle/plant.cpp:468
 msgid "Size As Alpha"
-msgstr ""
+msgstr "Tamaño como transparencia (alfa)"
 
 #: src/modules/mod_particle/plant.cpp:469
 msgid ""
 "If enabled, the alpha channel from the gradient is multiplied by the stem "
 "size, and an alpha of 1.0 is used when rendering"
 msgstr ""
+"Se está activado, a canle de transparencia do degradado é multiplicado polo "
+"tamaño do talo, e usase un valor de transparencia de 1,0 ao renderizar"
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
-msgstr ""
+msgstr "Inversa"
 
 #: src/modules/mod_particle/plant.cpp:474
 msgid "If enabled, render the plant in the opposite direction"
-msgstr ""
+msgstr "Se está activado, a planta amosase na dirección oposta"
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
-msgstr ""
+msgstr "Paso"
 
 #: src/modules/mod_particle/plant.cpp:479
 msgid "Measure of the distance between points when rendering"
-msgstr ""
+msgstr "Medida da distancia entre puntos ao renderizar"
 
 #: src/modules/mod_particle/plant.cpp:484
 msgid "Used to seed the pseudo-random number generator"
-msgstr ""
+msgstr "Usado para sementar o xerador de número pseudo-aleatorio"
 
 #: src/modules/mod_particle/plant.cpp:488
 msgid "Splits"
-msgstr ""
+msgstr "Divisións"
 
 #: src/modules/mod_particle/plant.cpp:489
 msgid "Maximum number of times that each sprout can sprout recursively"
-msgstr ""
+msgstr "O número máximo de veces que cada gromo pode agromar recursivamente"
 
 #: src/modules/mod_particle/plant.cpp:493
 msgid "Sprouts"
-msgstr ""
+msgstr "Gromos"
 
 #: src/modules/mod_particle/plant.cpp:494
 msgid "Number of places that growth occurs on each spline section"
-msgstr ""
+msgstr "Número de lugares nos que aparece un gromo en cada sección da Spline"
 
 #: src/modules/mod_particle/plant.cpp:498
 msgid "Random Factor"
-msgstr ""
+msgstr "Factor de aleatoriedade"
 
 #: src/modules/mod_particle/plant.cpp:499
 msgid ""
 "Used to scale down all random effects.  Set to zero to disable randomness"
 msgstr ""
+"Usado para escalar todos os efectos ao chou. Estabelecer a cero para "
+"desactivar a aleatoriedade"
 
 #: src/modules/mod_particle/plant.cpp:503
 msgid "Drag"
-msgstr ""
+msgstr "Arrastre"
 
 #: src/modules/mod_particle/plant.cpp:504
 msgid "Drag slows the growth"
-msgstr ""
+msgstr "O arrastre atrasa o crecemento"
 
 #: src/modules/mod_particle/plant.cpp:508
 msgid "Use Width"
-msgstr ""
+msgstr "Usar a largura"
 
 #: src/modules/mod_particle/plant.cpp:509
 msgid "Scale the velocity by the spline's width"
-msgstr ""
+msgstr "Escala a velocidade a travé da largura da Spline"
 
 #: src/modules/mod_png/trgt_cairo_png.cpp:117 src/synfig/target_cairo.cpp:201
 msgid "Cairo Surface bad status"
-msgstr ""
+msgstr "Estado defectuoso da superficie Cairo"
 
 #: src/modules/mod_png/trgt_png_spritesheet.cpp:176
 #, c-format
@@ -2066,55 +2124,57 @@ msgid ""
 "The image is too large. It's size must be not more than 5000*2000=10000000 "
 "px. Now is %d*%d=%d px."
 msgstr ""
+"A imaxe é grande de máis. O seu tamaño non debe ser maior que "
+"5000*2000=10000000 px. Agora é %d*%d=%d px"
 
 #: src/modules/mod_ppm/mptr_ppm.cpp:78
 #, c-format
 msgid "%s was not in PPM format"
-msgstr ""
+msgstr "%s non estaba no formato BMP"
 
 #: src/modules/mod_svg/layer_svg.cpp:53
 msgid "Import Svg"
-msgstr ""
+msgstr "Importar SVG"
 
 #: src/synfig/base_types.cpp:78 src/synfig/base_types.cpp:79
 msgid "bool"
-msgstr ""
+msgstr "boleano"
 
 #: src/synfig/base_types.cpp:99 src/synfig/base_types.cpp:100
 msgid "integer"
-msgstr ""
+msgstr "enteiro"
 
 #: src/synfig/base_types.cpp:122
 msgid "angle"
-msgstr ""
+msgstr "ángulo"
 
 #: src/synfig/base_types.cpp:166 src/synfig/base_types.cpp:167
 msgid "real"
-msgstr ""
+msgstr "real"
 
 #: src/synfig/base_types.cpp:194 src/synfig/base_types.cpp:195
 msgid "time"
-msgstr ""
+msgstr "tempo"
 
 #: src/synfig/base_types.cpp:220
 msgid "vector"
-msgstr ""
+msgstr "vector"
 
 #: src/synfig/base_types.cpp:239
 msgid "color"
-msgstr ""
+msgstr "cor"
 
 #: src/synfig/base_types.cpp:258
 msgid "segment"
-msgstr ""
+msgstr "segmento"
 
 #: src/synfig/base_types.cpp:278
 msgid "spline_point"
-msgstr ""
+msgstr "punto_spline"
 
 #: src/synfig/base_types.cpp:297
 msgid "matrix"
-msgstr ""
+msgstr "matriz"
 
 #: src/synfig/base_types.cpp:316
 msgid "bone_weight_pair"
@@ -2122,27 +2182,27 @@ msgstr ""
 
 #: src/synfig/base_types.cpp:336
 msgid "width_point"
-msgstr ""
+msgstr "punto_de_largura"
 
 #: src/synfig/base_types.cpp:356
 msgid "dash_item"
-msgstr ""
+msgstr "elemento_guión"
 
 #: src/synfig/base_types.cpp:375
 msgid "list"
-msgstr ""
+msgstr "lista"
 
 #: src/synfig/base_types.cpp:434
 msgid "canvas"
-msgstr ""
+msgstr "lenzo"
 
 #: src/synfig/base_types.cpp:465
 msgid "string"
-msgstr ""
+msgstr "cadea"
 
 #: src/synfig/base_types.cpp:486
 msgid "gradient"
-msgstr ""
+msgstr "degradado"
 
 #: src/synfig/base_types.cpp:505
 msgid "bone_object"
@@ -2154,323 +2214,368 @@ msgstr ""
 
 #: src/synfig/base_types.cpp:563
 msgid "transformation"
-msgstr ""
+msgstr "transformación"
 
 #: src/synfig/cairoimporter.cpp:88
 msgid "CairoImporter::open(): Cannot open empty filename"
-msgstr ""
+msgstr "CairoImporter::open(): Non é posíbel abrir un ficheiro baleiro"
 
 #: src/synfig/cairoimporter.cpp:102
 msgid "CairoImporter::open(): Couldn't find extension"
-msgstr ""
+msgstr "CairoImporter::open(): Non é posíbel atopar a extensión"
 
 #: src/synfig/cairoimporter.cpp:113
 msgid "CairoImporter::open(): Unknown file type -- "
-msgstr ""
+msgstr "CairoImporter::open(): Tipo de ficheiro descoñecido -- "
 
 #: src/synfig/cairolistimporter.cpp:166 src/synfig/cairolistimporter.cpp:167
 #: src/synfig/listimporter.cpp:166 src/synfig/listimporter.cpp:167
 msgid "No images in list"
-msgstr ""
+msgstr "Non hai imaxes na lista"
 
 #: src/synfig/canvas.cpp:838 src/synfig/canvas.cpp:909
 #: src/synfig/canvas.cpp:934
 msgid "in line"
-msgstr ""
+msgstr "aliñado"
 
 #: src/synfig/distance.cpp:258
 msgid "Units"
-msgstr ""
+msgstr "Unidades"
 
 #: src/synfig/distance.cpp:259
 msgid "Pixels"
-msgstr ""
+msgstr "Píxeles"
 
 #: src/synfig/distance.cpp:261
 msgid "Inches"
-msgstr ""
+msgstr "Polgadas"
 
 #: src/synfig/distance.cpp:262
 msgid "Meters"
-msgstr ""
+msgstr "Metros"
 
 #: src/synfig/distance.cpp:263
 msgid "Millimeters"
-msgstr ""
+msgstr "Milímetros"
 
 #: src/synfig/distance.cpp:264
 msgid "Centimeters"
-msgstr ""
+msgstr "Centímetros"
 
 #: src/synfig/importer.cpp:88
 msgid "Importer::open(): Cannot open empty filename"
-msgstr ""
+msgstr "Importer::open(): Non é posíbel abrir un ficheiro baleiro"
 
 #: src/synfig/importer.cpp:102
 msgid "Importer::open(): Couldn't find extension"
-msgstr ""
+msgstr "Importer::open(): Non é posíbel atopar a extensión"
 
 #: src/synfig/importer.cpp:113
 msgid "Importer::open(): Unknown file type -- "
-msgstr ""
+msgstr "Importer::open(): Tipo de ficheiro descoñecido -- "
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
-msgstr ""
+msgstr "Non é posíbel crear a superficie destino"
 
 #: src/synfig/layer.cpp:791
 msgid "Z Depth"
-msgstr ""
+msgstr "Profundidade Z"
 
 #: src/synfig/layer.cpp:793
 msgid "Modifies the position of the layer in the layer stack"
-msgstr ""
+msgstr "Modifica a posición de capas na rima de capas"
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
-msgstr ""
+msgstr "Superior á esquerda"
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
-msgstr ""
+msgstr "Canto superior esquerdo da imaxe"
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
-msgstr ""
+msgstr "Abaixo á dereita"
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
-msgstr ""
+msgstr "Canto inferior dereito da imaxe"
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
-msgstr ""
+msgstr "Canle alfa da capa"
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
-msgstr ""
+msgstr "Método de mestura"
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
-msgstr ""
+msgstr "O método de mestura utilizado para compoñer sobre as capas inferiores"
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
-msgstr ""
+msgstr "Duplicado"
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
-msgstr ""
+msgstr "Índice"
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
-msgstr ""
+msgstr "Índice da copia"
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
-msgstr ""
+msgstr "[MIME]"
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
-msgstr ""
+msgstr "Desenfoque de movemento"
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
-msgstr ""
+msgstr "Apertura"
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
-msgstr ""
+msgstr "Tempo de disparo"
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
-msgstr ""
+msgstr "Factor de submostraxe"
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
-msgstr ""
+msgstr "Multiplica o número de submostraxes renderizadas"
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
-msgstr ""
+msgstr "Tipo de submostraxe"
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
-msgstr ""
+msgstr "Tipo de curva para ponderación de submostraxes"
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
-msgstr ""
+msgstr "Constante"
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
-msgstr ""
+msgstr "Hiperbólico"
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
-msgstr ""
+msgstr "Cantidade inicial da submostraxe"
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
-msgstr ""
+msgstr "Cantidade relativa da primeira submostraxe, para ponderación lineal"
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
-msgstr ""
+msgstr "Cantidade final da submostraxe"
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
-msgstr ""
+msgstr "Cantidade relativa da última submostraxe, para ponderación lineal"
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
-msgstr ""
+msgstr "Desprazamento da posición"
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
-msgstr ""
+msgstr "Transformación"
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
-msgstr ""
+msgstr "Posición, rotación inclinación e escala"
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
-msgstr ""
+msgstr "Lenzo"
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
+msgstr "Contido do grupo"
+
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
-msgstr ""
+msgstr "Desprazamento de tempo que aplicar ao contexto"
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
-msgstr ""
+msgstr "Bloqueo da selección"
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
-msgstr ""
+msgstr "Cando está marcado, impide seleccionar os fillos usando o clic do rato"
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+#, fuzzy
+msgid "Skeleton Deformation"
+msgstr "transformación"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+#, fuzzy
+msgid "First corner of the bounds rectangle"
+msgstr "Primeiro canto do rectángulo"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+#, fuzzy
+msgid "Second corner of the bounds rectangle"
+msgstr "segundo canto do rectángulo"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+#, fuzzy
+msgid "Horizontal subdivisions"
+msgstr "Espazado horizontal"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:51
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2766,7 +2871,7 @@ msgstr ""
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr ""
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr ""
 
@@ -2968,8 +3073,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr ""
 
@@ -3009,13 +3114,13 @@ msgstr ""
 msgid "Divide"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr ""
 
@@ -3031,12 +3136,14 @@ msgstr ""
 msgid "Darken"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr ""
 
@@ -3150,230 +3257,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr ""
 
@@ -3382,1319 +3519,1355 @@ msgstr ""
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
-msgstr ""
+msgstr "Luminancia"
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+msgid "The value to be reversed"
+msgstr ""
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/he.gmo b/po/he.gmo
index da153b2..33e257f 100644
Binary files a/po/he.gmo and b/po/he.gmo differ
diff --git a/po/he.po b/po/he.po
index 8a2c5fd..df10dc2 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,10 +6,10 @@
 # Kunda, 2013-2014
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/synfig/language/"
 "he/)\n"
@@ -28,8 +28,9 @@ msgstr ""
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr ""
 
@@ -55,8 +56,9 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "צבע"
 
@@ -74,7 +76,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr ""
 
@@ -87,7 +89,7 @@ msgid "Italic"
 msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr ""
 
@@ -157,9 +159,12 @@ msgstr ""
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr ""
 
@@ -193,7 +198,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr ""
 
@@ -238,27 +243,27 @@ msgid "Type of blur to use"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr ""
 
@@ -345,6 +350,7 @@ msgstr ""
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr ""
 
@@ -355,13 +361,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr ""
 
@@ -419,7 +426,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr ""
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr ""
 
@@ -427,7 +434,8 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr ""
 
@@ -594,7 +602,8 @@ msgstr ""
 msgid "Scale Outside"
 msgstr ""
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr ""
 
@@ -611,12 +620,13 @@ msgstr ""
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr ""
 
@@ -638,7 +648,7 @@ msgid "Spherize"
 msgstr ""
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr ""
 
@@ -653,7 +663,7 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr "רדיוס"
 
@@ -757,12 +767,13 @@ msgstr ""
 msgid "Avoid alpha artifacts when checked"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr ""
 
@@ -770,16 +781,19 @@ msgstr ""
 msgid "Start time of the loop for the cycled context"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr ""
 
@@ -803,7 +817,8 @@ msgstr ""
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr ""
 
@@ -912,11 +927,12 @@ msgstr ""
 msgid "Size of the pattern"
 msgstr ""
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr ""
 
@@ -1006,13 +1022,14 @@ msgstr "דוגמא"
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr ""
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr ""
 
@@ -1024,6 +1041,7 @@ msgstr ""
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr ""
 
@@ -1063,9 +1081,9 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr ""
 
@@ -1129,7 +1147,7 @@ msgid "Blur"
 msgstr ""
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr ""
 
@@ -1157,7 +1175,8 @@ msgstr ""
 msgid "Exposure Adjust"
 msgstr ""
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr ""
 
@@ -1257,7 +1276,8 @@ msgstr ""
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr "גיאומטריה"
 
@@ -1303,37 +1323,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr ""
 
@@ -1367,14 +1387,14 @@ msgid "Smoothness"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr ""
 
@@ -1442,7 +1462,8 @@ msgstr ""
 msgid "Radius of the circle"
 msgstr ""
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr ""
 
@@ -1465,8 +1486,9 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr ""
 
@@ -1485,7 +1507,7 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr ""
 
@@ -1565,9 +1587,11 @@ msgstr ""
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr "זוית"
 
@@ -1653,10 +1677,10 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr ""
 
@@ -1799,32 +1823,32 @@ msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr ""
 
@@ -1882,13 +1906,20 @@ msgid "When checked the gradient is supersampled"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr ""
 
@@ -1910,6 +1941,7 @@ msgid "Seeds the random number generator"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr "מהירות"
 
@@ -1994,8 +2026,9 @@ msgid ""
 "size, and an alpha of 1.0 is used when rendering"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr ""
 
@@ -2003,8 +2036,9 @@ msgstr ""
 msgid "If enabled, render the plant in the opposite direction"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr ""
 
@@ -2215,7 +2249,7 @@ msgstr ""
 msgid "Importer::open(): Unknown file type -- "
 msgstr ""
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr ""
 
@@ -2227,252 +2261,292 @@ msgstr ""
 msgid "Modifies the position of the layer in the layer stack"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr ""
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr "קבוע"
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr "זמן הנוכחי"
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr "שם"
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+msgid "First corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+msgid "Second corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+msgid "Horizontal subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:51
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
-msgstr "לא ניתן לפתוח את הקובץ"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2768,7 +2842,7 @@ msgstr ""
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr ""
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr ""
 
@@ -2970,8 +3044,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr ""
 
@@ -3011,13 +3085,13 @@ msgstr "להכפיל"
 msgid "Divide"
 msgstr "לחלק"
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr ""
 
@@ -3033,12 +3107,14 @@ msgstr ""
 msgid "Darken"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr ""
 
@@ -3152,230 +3228,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr "Sine"
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr "Cos"
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr "אורך וקטור"
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr "וקטור X"
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr "וקטור Y"
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr "אמיתי"
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr ""
 
@@ -3384,1319 +3490,1355 @@ msgstr ""
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr "X"
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr "רב"
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr "שווה"
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr "פחות"
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr "אדום"
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr "ירוק"
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr "כחול"
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr "אלפא"
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr "האלפא של הצבע"
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr "ציר-X"
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr "ציר-Y"
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr "תטא"
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr "ציין התחלה"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr "ציין סיום"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr "התחלת הצבע"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr "סיום הצבע"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+msgid "The value to be reversed"
+msgstr ""
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr "צבע 1"
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr "צבע 2"
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr "וקטור"
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/hu.gmo b/po/hu.gmo
index 5a8db38..29fa5ea 100644
Binary files a/po/hu.gmo and b/po/hu.gmo differ
diff --git a/po/hu.po b/po/hu.po
index b752d13..d85886c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,10 +6,10 @@
 # Viktória S. <viktoria.s at freemail.hu>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/synfig/"
 "language/hu/)\n"
@@ -28,8 +28,9 @@ msgstr "Szöveg"
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "Egyéb"
 
@@ -55,8 +56,9 @@ msgstr "Megjelenítendő szöveg"
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "Szín"
 
@@ -74,7 +76,7 @@ msgstr "Stílus"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr "Normális"
 
@@ -87,7 +89,7 @@ msgid "Italic"
 msgstr "Dőlt"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr "Vastagság"
 
@@ -157,9 +159,12 @@ msgstr "A szöveg iránya"
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr "Középpont"
 
@@ -195,7 +200,7 @@ msgstr "Kapcsolja ki, ha a szöveget animálni akarja"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr "Invertál"
 
@@ -240,27 +245,27 @@ msgid "Type of blur to use"
 msgstr "A elmosás típusa"
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr "Négyzetes elmosás"
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr "Gyors Gauss elmosás"
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr "Négyzetháló elmosás"
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr "Gauss elmosás"
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr "Kör elmosás"
 
@@ -347,6 +352,7 @@ msgstr "Íves feszítés"
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr "Torzítások"
 
@@ -357,13 +363,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr "Szélesség"
 
@@ -422,7 +429,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr "A fájlnév már be van állítva erre:  \"%s\" (%s)"
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr "Fájlnév"
 
@@ -430,7 +437,8 @@ msgstr "Fájlnév"
 msgid "File to import"
 msgstr "Importálandó fájl"
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr "Idő-eltolás"
 
@@ -597,7 +605,8 @@ msgstr "Eltolás kívül"
 msgid "Scale Outside"
 msgstr "Nagyítás kívül"
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr "Forgatás"
 
@@ -614,12 +623,13 @@ msgstr "A pont ahová a középpontot szeretné"
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr "Mennyiség"
 
@@ -641,7 +651,7 @@ msgid "Spherize"
 msgstr "Gömbös torzítás"
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr "Pozíció"
 
@@ -656,7 +666,7 @@ msgstr "Ahol a körös torzítás közepe van"
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr "Sugár"
 
@@ -760,12 +770,13 @@ msgstr "Átlátszóság-biztos"
 msgid "Avoid alpha artifacts when checked"
 msgstr "Ha bekapcsolt megelőzi az átlátszósági hibákat"
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr "Ismétlés"
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr "Kapcsolódási időpont"
 
@@ -773,16 +784,19 @@ msgstr "Kapcsolódási időpont"
 msgid "Start time of the loop for the cycled context"
 msgstr "Az ismétlődés kezdete az ismétlődő elemekre vonatkozóan"
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr "Helyi időtartam"
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr "Az az időtartam, amikor az eredményül kapott ismétlődés elindul"
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr "Időtartam"
 
@@ -809,7 +823,8 @@ msgstr ""
 "Ha bekapcsolt, akkor az ismétlődések a helyi dőre nézve középpontosan "
 "tükrözöttek"
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr "Eltolás"
 
@@ -918,11 +933,12 @@ msgstr "A minta középpontja"
 msgid "Size of the pattern"
 msgstr "A minta mérete"
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr "Nagyítás"
 
@@ -1012,13 +1028,14 @@ msgstr "Példa"
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr "A réteg kitöltő színe"
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr "1. pont"
 
@@ -1030,6 +1047,7 @@ msgstr "A téglalap első sarka"
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr "2. pont"
 
@@ -1069,9 +1087,9 @@ msgstr "Metalabdák"
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr "Színátmenet"
 
@@ -1135,7 +1153,7 @@ msgid "Blur"
 msgstr "Elmosás"
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr "Elmosások"
 
@@ -1163,7 +1181,8 @@ msgstr "Kontraszt"
 msgid "Exposure Adjust"
 msgstr "Expozíció utánaállítás"
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr "Gamma utánaállítás"
 
@@ -1263,7 +1282,8 @@ msgstr "Fejlettebb kontúr"
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr "Geometria"
 
@@ -1309,37 +1329,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr "Kerekített vég"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr "Négyzete vég"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr "Csúcsos vég"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr "Lapos vég"
 
@@ -1373,14 +1393,15 @@ msgid "Smoothness"
 msgstr "Simaság"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+#, fuzzy
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr "A szélességi pontok közötti interpolációt határozza meg."
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr "Homogén"
 
@@ -1449,7 +1470,8 @@ msgstr "Kör"
 msgid "Radius of the circle"
 msgstr "A kör sugara"
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr "Lágy szél"
 
@@ -1472,8 +1494,9 @@ msgstr "Meghatározza a lágy szél halványítási függvényét"
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr "Lineáris"
 
@@ -1492,7 +1515,7 @@ msgstr "Sigmond"
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr "Koszinusz"
 
@@ -1574,9 +1597,11 @@ msgstr "Sugár a csillag belső pontjainak meghatározásához"
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr "Szög"
 
@@ -1662,10 +1687,10 @@ msgstr "A gradiens globális szélessége"
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr "Ismétlődő"
 
@@ -1810,32 +1835,32 @@ msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr "Interpoláció"
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr "Milyen interpolációt használjunk"
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr "Legközelebbi szomszéd"
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr "Spline"
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr "Köbös"
 
@@ -1893,13 +1918,20 @@ msgid "When checked the gradient is supersampled"
 msgstr "Ha bejelölt, akkor a színátmenet szuper mintavételezett"
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr "Csatol"
 
@@ -1921,6 +1953,7 @@ msgid "Seeds the random number generator"
 msgstr "A véletlen szám generátor kiinduló értéke"
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr "Sebesség"
 
@@ -2011,8 +2044,9 @@ msgstr ""
 "Ha bejelölt, akkor a hajtás mérete szorzódik a színátmenet átlátszósági "
 "értékével, és a megjelenítéskor 1.0 átlátszósági érték használatos"
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr "Visszafelé"
 
@@ -2020,8 +2054,9 @@ msgstr "Visszafelé"
 msgid "If enabled, render the plant in the opposite direction"
 msgstr "Ha bejelölt, akkor a növény az ellenkező irányba nő"
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr "Lépésköz"
 
@@ -2234,7 +2269,7 @@ msgstr "Importer::open(): a kiterjesztés nem található"
 msgid "Importer::open(): Unknown file type -- "
 msgstr "Importer::open(): Ismeretlen fájltípus"
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr "Nem lehet létrehozni a felület célt"
 
@@ -2246,253 +2281,295 @@ msgstr "Z mélység"
 msgid "Modifies the position of the layer in the layer stack"
 msgstr "A réteg rétegek közötti pozícióját módosítja"
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr "Bal felső"
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr "A kép bal felső sarka"
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr "Jobb alsó"
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr "A kép jobb alsó sarka"
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr "A réteg átlátszósága"
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr "Kompozíciós metódus"
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr "Az a metódus, ahogyan a rétegekből előállítsuk a végleges képet"
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr "Megkettőz"
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr "Sorszám"
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr "Sorszám másolása"
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr "[MIME]"
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr "Mozgási elmosódás"
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr "Rekesznyílás"
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr "Zársebesség"
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr "Almintavételezési faktor"
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr "A megjelenített almintavételezések számát szorozza meg"
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr "Almintavételezési típus"
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr "Az almintavételezések súlyozásához használt görbe típusa"
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr "Konstans"
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr "Hiperbolikus"
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr "Kezdeti almintavételezések száma"
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr "Az első alminta relatív mennyisége, lineáris súlyozáshoz"
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr "Végső almintavételezések száma"
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr "Az utolsó alminta relatív mennyisége, lineáris súlyozáshoz"
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr "Vászon"
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr "A környezetre alkalmazandó időeltolás"
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr "Ha bejelölt, akkor a gyerekeket nem lehet kiválasztani egér klikkel"
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr "Kontúr növelés"
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr "A gyermek kontúr rétegek növeléséhet használt exponenciális érték"
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr "Aktuális idő"
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr "Sokszög"
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr "Pont lista"
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr "Meghatározza a sokszög sarokpontjait"
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr "Alak"
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr "Belső"
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr "A réteg alakzatának színe"
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr "Élsimítás"
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr "Lágy szél típus"
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr "A lágy szél típusának meghatározása"
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr "Kitöltési stílus"
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr "A használandó kitöltési stílus"
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr "Nem nulla"
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr "Páros/páratlan"
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr "Név"
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+#, fuzzy
+msgid "First corner of the bounds rectangle"
+msgstr "A téglalap első sarka"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+#, fuzzy
+msgid "Second corner of the bounds rectangle"
+msgstr "A téglalap második sarka"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+#, fuzzy
+msgid "Horizontal subdivisions"
+msgstr "Vízszintes szóköz"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr "Homogén szín"
 
-#: src/synfig/layer_sound.cpp:51
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
-msgstr "Kerekített"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
-msgstr "A fájlt nem lehet megnyitni"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr "Csere"
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2799,7 +2876,7 @@ msgstr "üres  \"author\" entitás"
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr "A vászon '%s' tartalmaz nem definiált %s-t: %s"
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr "Érték csomópont"
 
@@ -3001,8 +3078,8 @@ msgstr "%s valószínűleg nem egy érvényes %s típusú paletta állomány"
 msgid "%s does not appear to be a supported palette file"
 msgstr "%s valószínűleg nem egy támogatott paletta fájl"
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr "Összetett"
 
@@ -3042,13 +3119,13 @@ msgstr "Szorzás"
 msgid "Divide"
 msgstr "Osztás"
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr "Összegzés"
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr "Kivonás"
 
@@ -3064,12 +3141,14 @@ msgstr "Világosít"
 msgid "Darken"
 msgstr "Sötétít"
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr "Színárnyalat"
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr "Telítettség"
 
@@ -3188,230 +3267,260 @@ msgstr ""
 "Time(): Az időkódban nincsen mértékegység megadva, képváltási frekvencia "
 "ismeretlen! Másodperc lesz az idő mértékegysége (\"%s\")"
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr "Sugaras összetett"
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr "Referencia"
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr "Szegmens tangens"
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr "Szegmenspont"
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr "Csíkok"
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr "Kettős tónus"
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr "Dinamikus lista"
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr "Színátmenet forgatása"
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr "Szinusz"
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr "Időzített csere"
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr "Ismétléses színátmenet"
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr "Exponenciális"
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr "Intervallum"
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr "Koszinusz"
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr "Arkusztangens2"
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr "Inverz tangens"
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr "Reciprokos"
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr "Egész"
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr "Vektor szög"
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr "Vektor hossz"
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr "Vektor X"
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr "Vektor Y"
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr "Színátmenet szín"
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr "Pont szorzat"
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr "Időpont szövegesen"
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr "Valós"
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr "Valós szövegesen"
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr "Összefésült lista"
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr "Szög szövegesen"
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr "Egész szövegesen"
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr "Logaritmikus"
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr "Szürkésített"
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr "Hatványozott"
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr "Összehasonlítás"
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr "Nem"
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr "És"
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr "Vagy"
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr "WPList"
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr "DIList"
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr "Rossz típus: az értékcsomópont '%s' nem fogad el '%s' típust"
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr "Helyfenntartó"
 
@@ -3420,1277 +3529,1313 @@ msgstr "Helyfenntartó"
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr "%s:%d rossz típus ennek: %s: szükséges %s, de ez van:  %s"
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ":Rossz típus"
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr "Egy vagy több paraméterem nincs beállítva"
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr "BO"
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr "Az összeadás bal oldala"
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr "JO"
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr "Az összeadás jobb oldala"
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr "Szorzó"
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr "Az érték, amely megsokszorozza az összeadást"
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr "ÉS"
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr "Kapcsolat1"
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr "Az és művelet első operandusa"
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr "Kapcsolat2"
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr "Az és művelet második operandusa"
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr "A szöveggé konvertálandó érték"
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr "A szöveg szélessége"
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr "Pontosság"
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr "A tizedes helyek száma"
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr "Nullákkal kitöltött"
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 "Ha bejelölt, a szöveg balról nullákkal lesz kitöltve, hogy a szöveg a "
 "megfelelő szélességű legyen"
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr "A mérföldkő ebben az időpontban már létezik"
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr "%s: nem használhat ilyet: %s egy animált értékcsomópontban"
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr "Animált"
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr "X"
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr "A listában nincsenek bejegyzések"
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr "A ret_list nem tartalmaz bejegyzéseket"
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr "Pont %03d"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr "Ha bekapcsolt, akkor a mennyiség ciklikus lesz"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr "Eltolás"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr "A tangens szög eltolásának értéke"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr "A tangens nagyítási értéke"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr "Fix hossz"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr "Ha bekapcsolt, akkor a tangens hossza rögzített"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr "Szélesség nagyítási értéke"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr "Az összehasonlítás bal oldala"
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr "Az összehasonlítás jobb oldala"
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr "Nagyobb"
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr "Ha bejelölt, igazat ad, ha bal oldal > jobb oldal"
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr "Egyenlő"
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr "Ha bejelölt, igazat ad, ha bal oldal = jobb oldal"
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr "Kissebb"
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr "Ha bejelölt, igazat ad, ha bal oldal < jobb oldal"
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr "Rossz típus az összetett értékhez"
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr "Vörös"
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr "A szín vörös komponense"
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr "Zöld"
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr "A szín zöld komponense"
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr "Kék"
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr "A szín kék komponense"
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr "Átlátszóság"
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr "A szín átlátszósága"
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr "Pont 1"
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr "A szegmens első pontja"
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr "Tangens 1"
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr "A szegmens első tangense"
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr "Pont 2"
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr "A szegmens második pontja"
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr "Tangens 2"
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr "A szegmens második tangense"
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr "X tengely"
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr "A vektor X koordinátája"
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr "Y tengely"
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr "A vektor Y koordinátája"
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr "Csúcspont"
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr "A szomszédokhoz relatív ki és bekapcsolt pozíciókat definiálja"
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr "Szétkapcsolt"
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr "Ha bekapcsolt, akkor a tangensek függetlenek"
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr "A szélességi pont szélessége"
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr "Az oldal típusa előtte"
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr "A szélességi pont interpolációjának típusát határozza meg"
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr "Interpolál"
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr "Az oldal típusa utána"
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr "Alsó határ"
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr "Felső határ"
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr "Hossz"
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr "A vonalkázott elem hossza"
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr "A vonalkázott elem oldalának típusát határozza meg"
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr "Érték"
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr "Az érték, aminek a koszinuszát kell számítani"
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr "Kilengés"
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr "Az eredmény koszinusz szorzója"
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr "Ettől"
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr "A sorszám kezdeti értéke"
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr "Eddig"
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr "A sorszám végső értéke"
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr "Sorszám növelési értéke"
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr "Lista típus/elem típus eltérés, az elérés eldobása"
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr "Elem %03d"
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr "Exponens"
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr "Az konstans 'e' hatvány kitevője"
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr "Az eredmény kitevő szorzója"
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr "Az elforgatandó színátmenet"
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr "A színátmenet eltolási értéke"
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr "A konvertálandó egész érték"
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr "Szövegek"
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr "Az összefűzendő szövegek listája"
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr "Elötte"
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr "Az összekapcsolt szövegek elé fűzendő szöveg"
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr "Elválasztó"
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr "Az összekapcsolt szövegek közébe fűzendő szöveg"
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr "Utána"
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr "Az összekapcsolt szövegek után fűzendő szöveg"
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr "Mérték"
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr "Az érték amellyel az aktuális időt szorozzuk (másodpercben)"
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr "Lejtő"
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr "A visszatérési érték, ha az aktuális idő nulla"
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr "Epszilon"
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr "Végtelen"
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr "A visszatérési érték, ha az eredmény a végtelenbe tart"
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr "NEM"
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr "Az értékcsomópont, amelyet a NEM műveletnél használunk"
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr "VAGY"
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr "Az értékcsomópont, amelyet a VAGY ligikai műveletnél használunk"
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr "Alap"
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr "A hatványozás alapja"
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr "A hatványkitevő"
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 "Az az érték, amelyet az alap vagy a kitevő nullával történő "
 "összehasonlításánál használunk"
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr "Rossz típus a sugaras összetett értékhez"
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr "Világosság"
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr "A vektor hossza"
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr "Téta"
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr "A vektor X tengelyhez viszonyított szöge"
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr "Néhány paraméterem nincs beállítva"
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr "Min"
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr "A visszatérési érték, ha a 'kapcsolat' kisebb"
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr "Max"
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr "A visszatérési érték, ha a 'kapcsolat' nagyobb"
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr "Az intervallum meghatározásához használt értékcsomópont"
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr "Az értékcsomópont, amelyet a reciprok érték kiszámításához használunk"
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 "Az az érték, amelyet annak eldöntésére használunk, hogy kapcsolat túl kicsi-"
 "e a reciprok számításhoz"
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr "A visszatérési érték, amikor a 'kapcsolat' < 'epszilon'"
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr "A hivatkozott érték"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr "Az ismétlendő forrás színátmenet"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr "Számosság"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr "A színátmenet ismétléseinek száma"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr "Kezdő szín használata"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 "Ha bejelölt, a 'Kezdő szín' értéket használjuk az eredmény színátmenet kezdő "
 "értékeként"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr "Befejező szín használata"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 "Ha bejelölt, a 'Befejező szín' értéket használjuk az eredmény színátmenet "
 "végső értékeként"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr "Kezdő szín"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr "Az eredmény színátmenet kezdő értéke"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr "Befejező szín"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr "Az eredmény színátmenet végső értéke"
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+#, fuzzy
+msgid "The value to be reversed"
+msgstr "A konvertálandó egész érték"
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr "Kísérlet nem invertálható értékcsomópont inverzének kiszámítására"
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr "A skálázáshoz használt értékcsomópont"
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr "Az az érték, amelyet az értékcsomópont megszorzására használunk"
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr "Szegmens"
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr "Az a szegmens, ahová a tangens kapcsolt"
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr "A kapcsolt tangens pozíciója a szegmensen (0,1]"
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr "A szegmens ahová a pont kapcsolva van"
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr "A kapcsolt pont szegmensen belüli pozíciója (0,1]"
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr "A szög amelynek szinuszát számítjuk"
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr "Az érték, amely szorozza az eredményül kapott szinuszt"
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr "A lépéshez használt értékcsomópont"
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr "A lépés hossza"
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr "Kezdő időpont"
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr "Az időpont, amikor a lépéskonverzió kezdődik"
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr "Metszéspont"
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr "Szín 1"
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr "A színátmeneti sávok egyik színe"
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr "Szín 2"
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr "A színátmeneti sávok másik színe"
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr "Sáv számosság"
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr "A színátmenetben lévő sávok száma"
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr "A színátmenetben lévő sávok szélessége"
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr "A kivonás bal oldala"
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr "A kivonás jobb oldala"
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr "Az érték, amely megszorozza a kivonási értéket"
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr "Kapcsolat kikapcsolt"
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr "Az érték csomópont, ha a kapcsolat kikapcsolt"
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr "Kapcsolat bekapcsolt"
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr "Az érték csomópont, ha a kapcsolat bekapcsolt"
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 "Ha bejelölt, 'Kapcsolat bekapcsolt' értékével, egyébként a 'Kapcsolat "
 "kikapcsolt' tér vissza"
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 "A visszatérési értékcsomópont, ha az aktuális idő az 'idő' - 'hossz' előtt "
 "van"
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr "A visszatérési értékcsomópont, ha az aktuális idő az 'idő' után van"
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr "Idő"
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr "Az időpont, ha a lineáris interpoláció véget ér"
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
@@ -4698,57 +4843,58 @@ msgstr ""
 "Az idő hossza, ha az 'Előtte' és 'Utána' értékek között lineáris "
 "interpoláció van"
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr "Az idő ciklushoz használt értékcsomópont"
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr "Az idő, amelyet szöveggé kell konvertálni"
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr "A színátmenet kezdő színe"
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr "A színátmenet befejező színe"
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr "Vektor"
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr "Az a vektor, amelyből a szöget számítjuk"
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr "A vektor, amelyből a hosszat számítjuk"
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr "A vektor, amelyből az X koordinátát számítjuk"
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr "A vektor, amelyből az Y koordinátát számítjuk"
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr "Szélességi pont %03d"
diff --git a/po/it.gmo b/po/it.gmo
index e445690..d1d7646 100644
Binary files a/po/it.gmo and b/po/it.gmo differ
diff --git a/po/it.po b/po/it.po
index f784e9e..c36fc06 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,10 +9,10 @@
 # morevnaproject <ksee.zelgadis at gmail.com>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/synfig/language/"
 "it/)\n"
@@ -31,8 +31,9 @@ msgstr "Testo"
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "Altro"
 
@@ -58,8 +59,9 @@ msgstr "Testo da Visualizzare"
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "Colore"
 
@@ -77,7 +79,7 @@ msgstr "Stile"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr "Normale"
 
@@ -90,7 +92,7 @@ msgid "Italic"
 msgstr "Italico [Corsivo]"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr "Peso"
 
@@ -160,9 +162,12 @@ msgstr "Orientamento del testo"
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr "Origine"
 
@@ -196,7 +201,7 @@ msgstr "Togli il segno di spunta se stai per animare il testo"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr "Inversione"
 
@@ -241,27 +246,27 @@ msgid "Type of blur to use"
 msgstr "Tipo di sfocatura da usare"
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr "Sfocatura Media Circostante \"Box Blur\""
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr "Sfocatura Gaussiana Veloce"
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr "Sfocatura a Tratteggio"
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr "Sfocatura Gaussiana"
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr "Sfocatura Radiale"
 
@@ -348,6 +353,7 @@ msgstr "Deformazione Curva"
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr "Distorsioni"
 
@@ -358,13 +364,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr "Larghezza"
 
@@ -422,7 +429,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr "Il nome del file pare sia già impostato a \"%s\" (%s)"
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr "Nome del file"
 
@@ -430,7 +437,8 @@ msgstr "Nome del file"
 msgid "File to import"
 msgstr "File da importare"
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr "Sfalsamento Tiemporale"
 
@@ -597,7 +605,8 @@ msgstr "Sfalsamento Esterno"
 msgid "Scale Outside"
 msgstr "Scala Esterno"
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr "Ruota"
 
@@ -614,12 +623,13 @@ msgstr "Punto dove impostare l'origine"
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr "Valore"
 
@@ -641,7 +651,7 @@ msgid "Spherize"
 msgstr "Sferizza"
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr "Posizione"
 
@@ -656,7 +666,7 @@ msgstr "Nei casi in cui la distorsione della sfera è centrata"
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr "Raggio"
 
@@ -760,12 +770,13 @@ msgstr "Mantenere la Transparencia"
 msgid "Avoid alpha artifacts when checked"
 msgstr "Evitare gli artefatti alfa quando spuntato"
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr "Ciclo Temporale Continuo"
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr "Tempo di Collegamento"
 
@@ -773,16 +784,19 @@ msgstr "Tempo di Collegamento"
 msgid "Start time of the loop for the cycled context"
 msgstr "Tempo di inizio ciclo per il contesto esaminato"
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr "Ora Locale"
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr "Il momento in cui inizia il ciclo risultante"
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr "Durata"
 
@@ -806,7 +820,8 @@ msgstr "Simmetrico"
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr "Se spuntato, i cicli vengono rispecchiati all'Ora Locale"
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr "Traduzione"
 
@@ -915,11 +930,12 @@ msgstr "Angolo superiore sinistro dell'immagine"
 msgid "Size of the pattern"
 msgstr "Angolo inferiore destro dell'immagine"
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr "Scala"
 
@@ -1010,13 +1026,14 @@ msgstr "Esempio"
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr "Colore di riempimento del livello"
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr "Punto 1"
 
@@ -1028,6 +1045,7 @@ msgstr "Primo vertice del rettangolo"
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr "Punto 2"
 
@@ -1067,9 +1085,9 @@ msgstr "Metasfere"
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr "Gradiente"
 
@@ -1133,7 +1151,7 @@ msgid "Blur"
 msgstr "Sfoca"
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr "Sfocature"
 
@@ -1161,7 +1179,8 @@ msgstr "Contrasto"
 msgid "Exposure Adjust"
 msgstr "Regolazione Esposizione"
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr "Regolazione Gamma"
 
@@ -1261,7 +1280,8 @@ msgstr "Contorno Avanzato"
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr "Geometría"
 
@@ -1307,37 +1327,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr "Terminazione arrotondata"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr "Terminazione squadrata"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr "Terminazione appuntita"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr "Terminazione Piatta"
 
@@ -1371,14 +1391,15 @@ msgid "Smoothness"
 msgstr "Smussato"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+#, fuzzy
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr "Determina l'interpolazione tra i punti. (0) Lineare (1) Smussato"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr "Omogeneo"
 
@@ -1448,7 +1469,8 @@ msgstr "Cerchio"
 msgid "Radius of the circle"
 msgstr "Raggio del cerchio"
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr "Sfumatura"
 
@@ -1471,8 +1493,9 @@ msgstr "Determina la funzione di deterioramento della sfumatura"
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr "Lineare"
 
@@ -1491,7 +1514,7 @@ msgstr "Sigmond"
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr "Coseno"
 
@@ -1573,9 +1596,11 @@ msgstr "Raggio dei punti interni della stella"
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr "Angolo"
 
@@ -1661,10 +1686,10 @@ msgstr "Ampiezza globale del gradiente"
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr "Ciclo Continuo"
 
@@ -1807,32 +1832,32 @@ msgstr "Cambia per modificare il valore casuale del disturbo"
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr "Interpolazione"
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr "Tipo di interpolazione da usare"
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr "Vicino più Prossimo"
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr "Curvatura"
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr "Cubico"
 
@@ -1890,13 +1915,20 @@ msgid "When checked the gradient is supersampled"
 msgstr "Se selezionato, il gradiente viene sovracampionato"
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr "Collegamento"
 
@@ -1918,6 +1950,7 @@ msgid "Seeds the random number generator"
 msgstr "Omposta il valore iniziale del generatore di numeri casuali"
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr "Velocità"
 
@@ -2009,8 +2042,9 @@ msgstr ""
 "la dimensione del fusto, ed un valore alfa di 1,0 è usato per la "
 "visualizzazione"
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr "Inversa"
 
@@ -2018,8 +2052,9 @@ msgstr "Inversa"
 msgid "If enabled, render the plant in the opposite direction"
 msgstr "Se abilitato, visualizza la pianta nella direzione opposta"
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr "Passo"
 
@@ -2232,7 +2267,7 @@ msgstr "Importer::open(): Non trova l'estensione"
 msgid "Importer::open(): Unknown file type -- "
 msgstr "Importer::open(): Tipo di file sconosiuto -- "
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr "Impossibile creare la superficie di destinazione"
 
@@ -2244,257 +2279,299 @@ msgstr "Profondità Z"
 msgid "Modifies the position of the layer in the layer stack"
 msgstr "Modifica la posizione del livello nella pila dei livelli"
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr "Alto-Sinistra"
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr "Angolo superiore sinistro dell'immagine"
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr "Basso-Destra"
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr "Angolo inferiore destro dell'immagine"
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr "canale Alfa del livello"
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr "Metodo Miscela"
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr "Metodo di fusione usato per comporre gli strati sottostanti"
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr "Duplicato"
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr "Indice"
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr "Copia Indice"
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr "[MIME]"
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr "Movimento Sfocatura"
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr "Apertura"
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr "Tiempo Otturazione"
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr "Fattore di sottocampionamento"
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr "Moltiplica il numero di sottocampionamentii renderizzati"
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr "Tipo Sottocampionamento"
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr "Tipo di curvatura per la ponderazione dei sottocampionamenti"
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr "Costante"
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr "Iperbolico"
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr "Valore di partenza del sottocampionamento"
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 "Valore relativo del primo sottocampionamento, per la ponderazione lineare"
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr "Valore finale del sottocampionamento"
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 "Valore relativo dell'ultimo sottocampionamento, per la ponderazione lineare"
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr "Tela"
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr "Scostamento temporale da applicare al contesto"
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 "Se selezionato, impedisce di selezionare i discendenti con il clic del mouse"
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr "Incremento contorno"
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 "Valore esponenziale di crescita dei figli per l'ampiezza dei livelli Contorno"
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr "Ora Attuale"
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr "Poligono"
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr "Lista Vertici"
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr "Definisce gli spigoli del poligono"
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr "Forma"
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr "Interno"
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr "Colore del Piano_Forma"
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr "Antiscalettatura"
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr "Tipo di Sfumatura"
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr "Tipo di sfumatura da usare"
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr "Stile Serpentina"
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr "Stile serpentina da usare"
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr "Non Zero"
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr "Pari/Dispari"
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr "Nome"
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+#, fuzzy
+msgid "First corner of the bounds rectangle"
+msgstr "Primo vertice del rettangolo"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+#, fuzzy
+msgid "Second corner of the bounds rectangle"
+msgstr "Secondo vertice del rettangolo"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+#, fuzzy
+msgid "Horizontal subdivisions"
+msgstr "Spaziatura Orizzontale"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr "Colore Pieno"
 
-#: src/synfig/layer_sound.cpp:51
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
-msgstr "Arrotondato"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
-msgstr "Impossibile aprire il file"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr "Interruttore"
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2800,7 +2877,7 @@ msgstr "entità \"author\" vuota"
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr "Tela '%s' ha '%s':'%s' indefinito"
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr "Valore del Nodo"
 
@@ -3002,8 +3079,8 @@ msgstr "%s non sembra essere un file di tavolozza valido %s"
 msgid "%s does not appear to be a supported palette file"
 msgstr "%s non sembra essere un file di tavolozza supportato"
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr "Composito"
 
@@ -3043,13 +3120,13 @@ msgstr "_Moltiplica"
 msgid "Divide"
 msgstr "Divide"
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr "Somma"
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr "Sottrai"
 
@@ -3065,12 +3142,14 @@ msgstr "Sc_hiarimento"
 msgid "Darken"
 msgstr "Scurisce"
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr "Tonalità"
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr "Saturazione"
 
@@ -3189,230 +3268,260 @@ msgstr ""
 "Time(): Nessuna unità fornita nel time code e il numero immagini al secondo "
 "è sconosciuto! Assumo SECONDI"
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr "Radiale Composito"
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr "Riferimento"
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr "Tangente Segmento"
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr "Vertice Segmento"
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr "Striscie"
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr "Doppia Tonalità"
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr "Lista Dinamica"
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr "Rotazione Gradiente"
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr "Seno"
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr "Interscambio Temporizzato"
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr "Ripetizione Gradiente"
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr "Esponenziale"
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr "Intervallo"
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr "Coseno"
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr "aTan2"
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr "Tangente Inversa"
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr "Reciproco"
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr "Intero"
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr "Angolo Vettore"
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr "Lunghezza Vettore"
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr "Vettore X"
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr "Vettore Y"
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr "Colore Gradiente"
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr "Punto Prodotto"
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr "Stringa Tempo"
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr "Reale"
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr "Stringa Reale"
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr "Lista Unita"
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr "Stringa Angolo"
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr "Stringa Intero"
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr "Logaritmo"
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr "Disattivato"
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr "Potenza"
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr "Comparare"
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr "No"
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr "Sì"
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr "O"
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr "WPList"
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr "DILista"
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr "Tipo errato: Il valore del Nodo %s non acetta il tipo %s"
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr "Segnaposto"
 
@@ -3421,1276 +3530,1312 @@ msgstr "Segnaposto"
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr "%s:%d tipo errato per %s: richiesto %s ma ottenuto %s"
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ":Tipo errato "
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr "Uno o entrambe i parametri non sono impostati"
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr "LHS"
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr "Lato sinistro del componente aggiuntivo"
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr "RHS"
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr "Sul lato destro del componente aggiuntivo"
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr "Scalare"
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr "Valore che moltiplica il componente aggiuntivo"
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr "E"
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr "Collegamento1"
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr "Primo operando dell'operazione AND"
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr "Collegamento2"
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr "secondo operando dell'operazione AND"
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr "Valore da convertire in stringa"
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr "Larghezza della stringa"
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr "Precisione"
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr "Numero di cifre decimali"
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr "Completato con degli \"0\""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 "Se selezionato, la stringa viene riempita con zeri a sinistra sì che "
 "corrisponda alla larghezza"
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr ""
 "Un punto di interpolazione (waypoint) esiste già in questo punto temporale"
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr "%s: Non puoi usare %s in un Valore del Nodo animato"
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr "Animato"
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr "X"
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr "Nessun valore nella lista"
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr "Nessun valore nella ret_list"
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr "Vertice %03d"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr "Se selezionato, l'importo verrà ciclato"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr "Sfalsamento"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr "Scostamento angolare della tangente"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr "Scala della tangente"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr "Lunghezza Fissa"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr "Se selezionato, la lunghezza della tangente viene fissata"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr "Scala della larghezza"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr "Il lato sinistro del confronto"
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr "Il lato destro del confronto"
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr "Maggiore"
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr "Se selezionato, restituisce true se LHS > RHS"
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr "Uguale"
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr "Se selezionato, restituisce true se LHS = RHS"
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr "Minore"
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr "Se selezionato, restituisce true se LHS < RHS"
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr "Tipo errato per composito"
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr "Rosso"
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr "La componente rossa del colore"
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr "Verde"
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr "La componente verde del colore"
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr "Blu"
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr "La componente blu del colore"
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr "Alfa"
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr "L'alfa del colore"
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr "Vertice 1"
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr "Il primo vertice del segmento"
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr "Tangente 1"
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr "La tangente prima del segmento"
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr "Vertice 2"
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr "Il secondo vertice del segmento"
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr "Tangente 2"
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr "La seconda tangente del segmento"
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr "Asse-X"
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr "La componente Asse-X del vettore"
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr "Asse-Y"
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr "La componente Asse-Y del vettore"
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr "Vertice"
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr "Definisce la posizione On/Off rispetto ai vicini"
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr "Dividere"
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr "Se selezionato, le tangenti sono indipendenti"
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr "La larghezza del Punto Larghezza"
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr "Batti prima il lato"
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr "Definisce il tipo di interpolazione del punto di larghezza"
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr "Interpolare"
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr "Batti Dopo il Lato"
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr "Limite Inferiore"
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr "Limite Superiore"
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr "Lunghezza"
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr "La lunghezza della Voce di Tratteggio"
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr "Definisce la parte tipo della voce trattino"
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr "Valore"
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr "Valore per calcolare il coseno"
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr "Ampiezza"
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr "Moltiplicatore del coseno risultante"
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr "Da"
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr "Valore iniziale dell'indice"
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr "A"
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr "Valore finale dell'indice"
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr "Valore incremento dell'indice"
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr "Tipo lista/Tipo elemento discordante, discordanza rifiutata"
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr "Elemento %03d"
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr "Esponente"
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr "Valore di incremento della costante 'e'"
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr "Moltiplicatore dell'esponente risultante"
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr "Gradiente origine di rotazione"
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr "Valore di compensazione del gradiente"
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr "Valore intero da convertire"
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr "Stringhe"
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr "Lista sequenze da collegare"
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr "Prima"
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr "Sequenza da porre prima delle sequenze collegate"
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr "Separatore"
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr "Sequenza da porre tra ogni sequenza collegata"
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr "Dopo"
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr "La sequenza da porre dopo le sequenze collegate"
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr "Frequenza"
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr "Valore che viene moltiplicato per il tempo corrente (in secondi)"
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr "Inclinazione"
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr "Valore restituito quando l'ora corrente è pari a zero"
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr "Epsilon"
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr "Infinito"
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr "Valore restituito quando il risultato tende a infinito"
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr "NON"
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr "Valore del nodo usato per fare l'operazione NOT"
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr "O"
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr "Valore del nodo usato per l'operazione booleana OR"
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr "Base"
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr "La base da elevare a potenza"
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr "Potenza utilizzata per aumentare la base"
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr "Valore utilizzato per confrontare base o potenza con zero"
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr "Tipo errato per composito radiale"
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr "Luma"
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr "Lunghezza del vettore"
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr "Theta"
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr "Angolo del vettore con l'asse X"
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr "Alcuni miei parametri non sono impostati"
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr "Min"
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr "Valore restituito quando 'Collegamento' è minore"
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr "Max"
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr "Valore restituito quando 'Collegamento' è maggiore"
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr "Valore del nodo che limitare la sua gamma"
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr "Valore del nodo utilizzato per calcolare il suo reciproco"
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 "Valore utilizzato per decidere se 'Collegamento' è troppo piccolo per "
 "ottenere il suo reciproco"
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr "Valore risultante quando 'Collegamento' < 'Epsilon'"
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr "Valore di riferimento"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr "Gradiente sorgente da ripetere"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr "Conteggio"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr "Numero di ripetizioni del gradiente"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr "Specifica Inizio"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 "Se selezionato, 'Colore Iniziale' viene utilizzato come punto di partenza "
 "del gradiente risultante"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr "Specifica Fine"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 "Se selezionato, 'Colore Finale' viene utilizzato come punto di partenza del "
 "gradiente risultante"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr "Colore di Partenza"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr "Usato come inizio del gradiente risultante"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr "Colore Finale"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr "Usato come fine del gradiente risultante"
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+#, fuzzy
+msgid "The value to be reversed"
+msgstr "Valore intero da convertire"
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr "Tentativo di ottenere l'inverso un Valore del Nodo non invertible"
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr "Valore del nodo utilizzato per scalare"
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr "Valore che moltiplica il valore del nodo"
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr "Segmento"
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr "Segmento al quale è collegata la tangente"
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr "Posizione della tangente collegata sul segmento (0,1]"
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr "Segmento al quale è legato il vertice"
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr "La posizione del vertice collegato sul segmento (0,1]"
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr "Angolo a partire dal quale si calcola il seno"
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr "Valore che moltiplica il seno risultante"
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr "Il valore del nodo utilizzato per eseguire la fase"
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr "Durata della fase"
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr "Tempo Avvio"
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr "Tempo in cui la fase di conversione inizia"
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr "Intersezione"
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr "Colore 1"
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr "Un colore delle strisce gradiente"
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr "Colore 2"
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr "Altro colore delle strisce gradiente"
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr "Conteggio Striscie"
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr "Numero strisce nel gradiente"
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr "Larghezza delle strisce nella sfumatura tra [0,1]"
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr "Lato Sinistro della sottrazione"
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr "Lato Destro della sottrazione"
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr "Valore che moltiplica la sottrazione"
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr "Collegamento Spento"
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr "Valore del nodo restituito quando l'interruttore è spento"
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr "Collegamento Acceso"
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr "Il valore del nodo restituito quando l'interruttore è acceso"
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 "Se selezionato, 'Collegamento Acceso' restituisce, altrimenti restituisce "
 "'Collegamento Spento'"
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 "Valore di nodo restituito quando il tempo attuale è prima di 'tempo' - "
 "'lunghezza'"
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr "Valore del nodo restituito quando l'ora corrente è dopo 'tempo'"
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr "Tempo"
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr "Il tempo in cui l'interpolazione lineare finisce"
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
@@ -4698,57 +4843,58 @@ msgstr ""
 "Lunghezza del tempo in cui l'interpolazione lineare tra il 'prima' e 'dopo' "
 "è generato"
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr "Valore del nodo a ciclo temporale"
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr "Tempo che viene convertito in stringa"
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr "Colore iniziale del gradiente"
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr "Colore finale del gradiente"
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr "Vettore"
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr "Vettore da cui viene calcolato l'angolo"
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr "Vettore da cui viene calcolata la lunghezza"
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr "Vettore da cui la coordinata X è estratta"
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr "Vettore da cui la coordinata Y è estratta"
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr "Punto di Larghezza %03d"
diff --git a/po/ja_JP.gmo b/po/ja_JP.gmo
index b78de3d..a5210c1 100644
Binary files a/po/ja_JP.gmo and b/po/ja_JP.gmo differ
diff --git a/po/ja_JP.po b/po/ja_JP.po
index 3262fb7..907acd3 100644
--- a/po/ja_JP.po
+++ b/po/ja_JP.po
@@ -8,10 +8,10 @@
 # Tou Omiya, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/synfig/"
 "language/ja_JP/)\n"
@@ -30,8 +30,9 @@ msgstr "テキスト"
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "その他"
 
@@ -57,8 +58,9 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "色"
 
@@ -76,7 +78,7 @@ msgstr "スタイル"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr "標準"
 
@@ -89,7 +91,7 @@ msgid "Italic"
 msgstr "イタリック体"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr "ウェイト"
 
@@ -159,9 +161,12 @@ msgstr "テキストの方向"
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr "原点"
 
@@ -196,7 +201,7 @@ msgstr "テキストをアニメーションさせる場合は無効にしてく
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr "反転"
 
@@ -241,27 +246,27 @@ msgid "Type of blur to use"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr "高速ガウスぼかし"
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr "クロスハッチングぼかし"
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr "ガウスぼかし"
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr ""
 
@@ -348,6 +353,7 @@ msgstr "カーブワープ"
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr "ゆがみ"
 
@@ -358,13 +364,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr ""
 
@@ -422,7 +429,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr ""
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr "ファイル名"
 
@@ -430,7 +437,8 @@ msgstr "ファイル名"
 msgid "File to import"
 msgstr "インポートするファイル"
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr "時間オフセット"
 
@@ -597,7 +605,8 @@ msgstr ""
 msgid "Scale Outside"
 msgstr ""
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr "回転"
 
@@ -614,12 +623,13 @@ msgstr ""
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr "量"
 
@@ -641,7 +651,7 @@ msgid "Spherize"
 msgstr ""
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr "位置"
 
@@ -656,7 +666,7 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr "半径"
 
@@ -760,12 +770,13 @@ msgstr ""
 msgid "Avoid alpha artifacts when checked"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr "タイムループ"
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr ""
 
@@ -773,16 +784,19 @@ msgstr ""
 msgid "Start time of the loop for the cycled context"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr ""
 
@@ -806,7 +820,8 @@ msgstr ""
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr "移動"
 
@@ -915,11 +930,12 @@ msgstr ""
 msgid "Size of the pattern"
 msgstr ""
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr "拡大/縮小"
 
@@ -1009,13 +1025,14 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr "レイヤーを塗りつぶす色"
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr "頂点 1"
 
@@ -1027,6 +1044,7 @@ msgstr "矩形の第 1 頂点"
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr "頂点 2"
 
@@ -1066,9 +1084,9 @@ msgstr "メタボール"
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr "グラデーション"
 
@@ -1136,7 +1154,7 @@ msgid "Blur"
 msgstr "ぼかし"
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr "ぼかし"
 
@@ -1164,7 +1182,8 @@ msgstr ""
 msgid "Exposure Adjust"
 msgstr ""
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr ""
 
@@ -1264,7 +1283,8 @@ msgstr ""
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr "図形"
 
@@ -1310,37 +1330,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr ""
 
@@ -1374,14 +1394,14 @@ msgid "Smoothness"
 msgstr "なめらかさ"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr ""
 
@@ -1449,7 +1469,8 @@ msgstr "円"
 msgid "Radius of the circle"
 msgstr "円の半径"
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr "境界のぼかし"
 
@@ -1472,8 +1493,9 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr "線形"
 
@@ -1492,7 +1514,7 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr "コサイン"
 
@@ -1572,9 +1594,11 @@ msgstr ""
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr "角度"
 
@@ -1660,10 +1684,10 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr "ループ"
 
@@ -1806,32 +1830,32 @@ msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr "補間方法"
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr "どのような方式で補間するかを指定します"
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr "ニアレストネイバー"
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr "スプライン"
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr "キュービック"
 
@@ -1889,13 +1913,20 @@ msgid "When checked the gradient is supersampled"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr "リンク"
 
@@ -1917,6 +1948,7 @@ msgid "Seeds the random number generator"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr ""
 
@@ -2001,8 +2033,9 @@ msgid ""
 "size, and an alpha of 1.0 is used when rendering"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr ""
 
@@ -2010,8 +2043,9 @@ msgstr ""
 msgid "If enabled, render the plant in the opposite direction"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr ""
 
@@ -2222,7 +2256,7 @@ msgstr ""
 msgid "Importer::open(): Unknown file type -- "
 msgstr ""
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr ""
 
@@ -2234,252 +2268,295 @@ msgstr "Z 深度"
 msgid "Modifies the position of the layer in the layer stack"
 msgstr "レイヤースタック中のレイヤーの位置を変更します"
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr "レイヤーのアルファチャンネル"
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr "ブレンドの種類"
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr "下のレイヤーとの合成方法"
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr "複製"
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr ""
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr "モーションぼかし"
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr "定数"
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr "位置オフセット"
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr "多角形"
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr "アンチエイリアシング"
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr "境界のぼかしの種類"
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr "スケルトン"
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr "名前"
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+#, fuzzy
+msgid "First corner of the bounds rectangle"
+msgstr "矩形の第 1 頂点"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+#, fuzzy
+msgid "Second corner of the bounds rectangle"
+msgstr "矩形の第 2 頂点"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+#, fuzzy
+msgid "Horizontal subdivisions"
+msgstr "水平間隔"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr "単色"
 
-#: src/synfig/layer_sound.cpp:51
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
-msgstr "ファイルを開けません"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2775,7 +2852,7 @@ msgstr ""
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr ""
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr ""
 
@@ -2977,8 +3054,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr "合成"
 
@@ -3018,13 +3095,13 @@ msgstr "乗算"
 msgid "Divide"
 msgstr "除算"
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr "加算"
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr "減算"
 
@@ -3040,12 +3117,14 @@ msgstr "明るく"
 msgid "Darken"
 msgstr "暗く"
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr "色相"
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr "彩度"
 
@@ -3159,230 +3238,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr "資料"
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr "整数"
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr "ベクター X"
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr "ベクター Y"
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr "実数"
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr "平均"
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr "加重平均"
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr ""
 
@@ -3391,1319 +3500,1355 @@ msgstr ""
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr "頂点 %03d"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr "オフセット"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr "接線の角度オフセット"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr "赤"
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr "緑"
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr "青"
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr "アルファ"
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr "X 軸"
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr "Y 軸"
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr "頂点"
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr "補間"
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr "長さ"
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr "値"
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr "輝度"
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+msgid "The value to be reversed"
+msgstr ""
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr "線分"
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr "時間"
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr "ベクター"
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/lt.gmo b/po/lt.gmo
index 5d4cb7e..9c77ea1 100644
Binary files a/po/lt.gmo and b/po/lt.gmo differ
diff --git a/po/lt.po b/po/lt.po
index 1a9ba38..42a78f0 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,10 +7,10 @@
 # Oskaras <violentass at gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Lithuanian (http://www.transifex.com/projects/p/synfig/"
 "language/lt/)\n"
@@ -30,8 +30,9 @@ msgstr "Tekstas"
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "Kitas"
 
@@ -57,8 +58,9 @@ msgstr "Atvaizduojamas tekstas "
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "Spalva"
 
@@ -76,7 +78,7 @@ msgstr "Stilius"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr "Normalus"
 
@@ -89,7 +91,7 @@ msgid "Italic"
 msgstr "Italic"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr "Sodrumas"
 
@@ -159,9 +161,12 @@ msgstr "Teksto orientacija"
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr "Pradžia"
 
@@ -195,7 +200,7 @@ msgstr "Išjungti šią funkciją, jei jūs ketinate animuoti tekstą"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr "Invertuoti"
 
@@ -242,27 +247,27 @@ msgid "Type of blur to use"
 msgstr "Suliejimo tipas"
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr "Languotas suliejimas"
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr "Greitas Gauso suliejimas"
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr "Kryžminis suliejimas"
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr "Gauso suliejimas"
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr "Disko suliejimas"
 
@@ -349,6 +354,7 @@ msgstr "Kreivės deformacija"
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr "Iškraipymai"
 
@@ -359,13 +365,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr "Plotis"
 
@@ -423,7 +430,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr "Failo pavadinimas, atrodo, jau yra nustatytas \"%s\" (%s)"
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr "Failo pavadinimas"
 
@@ -431,7 +438,8 @@ msgstr "Failo pavadinimas"
 msgid "File to import"
 msgstr "Importo failas"
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr "Laiko juosta"
 
@@ -598,7 +606,8 @@ msgstr "Poslinkis išorėje"
 msgid "Scale Outside"
 msgstr "Mastelis išorėje"
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr "Pasukti"
 
@@ -615,12 +624,13 @@ msgstr "Nurodykite, kur norite perkelti centrą"
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr "Kiekis"
 
@@ -642,7 +652,7 @@ msgid "Spherize"
 msgstr "Sferizavimas"
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr "Pozicija"
 
@@ -657,7 +667,7 @@ msgstr "Kur yra sferinio iškraipymo centras"
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr "Spindulys"
 
@@ -761,12 +771,13 @@ msgstr "Neliesti alfa"
 msgid "Avoid alpha artifacts when checked"
 msgstr "Įjungus padeda išvengti alfa artefaktų"
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr "Laiko ciklas"
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr "Sąryšio laikas"
 
@@ -774,16 +785,19 @@ msgstr "Sąryšio laikas"
 msgid "Start time of the loop for the cycled context"
 msgstr "Ciklo pradžios laikas uždaram kontekstui"
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr "Lokalus laikas"
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr "Laikas, kai prasideda rezultato ciklas"
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr "Trukmė"
 
@@ -807,7 +821,8 @@ msgstr "Simetriškas"
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr "Kai įjungta, ciklai atvaizduojami centre Vietos Laiku"
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr "Perkelti"
 
@@ -916,11 +931,12 @@ msgstr "Šablono centras"
 msgid "Size of the pattern"
 msgstr "Šablono dydis"
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr "Mastelis"
 
@@ -1010,13 +1026,14 @@ msgstr "Pavyzdys"
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr "Sluoksnio užpildo spalva"
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr "Taškas 1"
 
@@ -1028,6 +1045,7 @@ msgstr "Pirmas stačiakampio kampas"
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr "Taškas 2"
 
@@ -1067,9 +1085,9 @@ msgstr "Metakamuoliai"
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr "Gradientas"
 
@@ -1133,7 +1151,7 @@ msgid "Blur"
 msgstr "Sulietas"
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr "Sulieti"
 
@@ -1161,7 +1179,8 @@ msgstr "Kontrastas"
 msgid "Exposure Adjust"
 msgstr "Ekspozicijos nustatymas"
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr "Gamos nustatymas"
 
@@ -1261,7 +1280,8 @@ msgstr ""
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr "Geometrija"
 
@@ -1307,37 +1327,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr ""
 
@@ -1371,14 +1391,14 @@ msgid "Smoothness"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr "Vienodas"
 
@@ -1446,7 +1466,8 @@ msgstr "Apskritimas"
 msgid "Radius of the circle"
 msgstr "Apskritimo spindulys"
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr "Ištempimas"
 
@@ -1469,8 +1490,9 @@ msgstr "Nustato ištempimo sumažėjimo funkcija"
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr "Linijinis"
 
@@ -1489,7 +1511,7 @@ msgstr "Sigmond"
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr "Kosinusas"
 
@@ -1569,9 +1591,11 @@ msgstr "Vidinis žvaigždės spindulys "
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr "Kampas"
 
@@ -1657,10 +1681,10 @@ msgstr "Globalus gradiento plotis"
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr "Kilpa"
 
@@ -1803,32 +1827,32 @@ msgstr "Atsitiktinis triukšmo grūdo keitimas"
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr "Interpoliacija"
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr "Kokio tipo interpoliacija naudoti"
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr "Nearest Neighbor"
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr "Spline"
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr "Kubinę"
 
@@ -1886,13 +1910,20 @@ msgid "When checked the gradient is supersampled"
 msgstr "Kai įjungta, gradientas yra supersampled"
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr "Jungtis"
 
@@ -1914,6 +1945,7 @@ msgid "Seeds the random number generator"
 msgstr "Sėklos atsitiktinių skaičių generatorius"
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr "Greitis"
 
@@ -2004,8 +2036,9 @@ msgstr ""
 "If enabled, the alpha channel from the gradient is multiplied by the stem "
 "size, and an alpha of 1.0 is used when rendering"
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr "Atvirkštinis"
 
@@ -2013,8 +2046,9 @@ msgstr "Atvirkštinis"
 msgid "If enabled, render the plant in the opposite direction"
 msgstr "Jei įjungta, augalas vaizduojamas priešinga kryptimi"
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr "Žingsnis"
 
@@ -2225,7 +2259,7 @@ msgstr "Importuotojas::atverti(): Nepavyko rasti plėtinio"
 msgid "Importer::open(): Unknown file type -- "
 msgstr "Importuotojas::atverti(): Nežinomas failo tipas -- "
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr "Nepavyko sukurti paviršiaus adresato"
 
@@ -2237,253 +2271,296 @@ msgstr "Z Gylis"
 msgid "Modifies the position of the layer in the layer stack"
 msgstr "Pakeičia sluoksnio poziciją sluoksnio krūvoje "
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr "Viršutiniame kairiajame"
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr "Paveikslėlio viršutinis kairysis kampas"
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr "Apatiniame dešiniajame"
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr "Paveikslėlio apatinis dešinysis kampas"
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr "Sluoksnio Alfa kanalas"
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr "Maišymo metodas"
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr "Dublikatas"
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr "Rodyklė"
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr "Indekso kopija"
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr "[MIME]"
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr "Suliejimas judesiu"
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr "Diafragma"
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr "Užrakto laikas"
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr "Submėginių faktorius"
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr "Mėginio tipas"
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr "Pastovus"
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr "Hiperbolinis"
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr "Submėginys Pradėti Suma"
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr "Transformacija"
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr "Drobė"
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr "Grupės turinys"
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr "Dabartinis laikas"
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr "Daugiakampis"
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr "Viršūnių sąrašas"
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr "Nustatyti daugiakampio kampus"
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr "Figūra"
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr "Vidaus"
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr "Sluoksnio_figūros spalva"
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr "Išlyginimas"
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr "Ištempimo tipas"
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr "Naudojamas ištempimo tipas"
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr "Spiralinis stilius"
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr "Naudojamas spiralinis stilius"
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr "Nenulinis"
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr "Lyginis/Nelyginis"
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr "Skeletas"
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr "Kaulai"
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+#, fuzzy
+msgid "Skeleton Deformation"
+msgstr "transformacija"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+#, fuzzy
+msgid "First corner of the bounds rectangle"
+msgstr "Pirmas stačiakampio kampas"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+#, fuzzy
+msgid "Second corner of the bounds rectangle"
+msgstr "Antras stačiakampio kampas"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+#, fuzzy
+msgid "Horizontal subdivisions"
+msgstr "Horizontalus išsidėstymas"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr "Vientisa spalva"
 
-#: src/synfig/layer_sound.cpp:51
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
-msgstr "Užapvalinimas"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
-msgstr "Nepavyko atidaryti failo"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr "Pakeitimas"
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2779,7 +2856,7 @@ msgstr ""
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr ""
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr "Mazgo reikšmė"
 
@@ -2981,8 +3058,8 @@ msgstr "%s netinkamas %s paletės failas"
 msgid "%s does not appear to be a supported palette file"
 msgstr "%s nepalaikomas paletės failas"
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr "Mišinys"
 
@@ -3022,13 +3099,13 @@ msgstr "Daugyba"
 msgid "Divide"
 msgstr "Dalyba"
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr "Papildytas"
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr "Atimti"
 
@@ -3044,12 +3121,14 @@ msgstr "Paryškinti"
 msgid "Darken"
 msgstr "Tamsinimas"
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr "Atspalvis"
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr "Sodrumas"
 
@@ -3163,230 +3242,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr "Radialinis "
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr "Nuoroda"
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr "Segmento liestinė"
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr "Segmentas viršūnė"
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr "Juostelėmis"
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr "Dviejų atspalvių"
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr "Dinaminis sąrašas"
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr "Pasukti gradientą"
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr "Sin"
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr "Pakartoti gradientą"
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr "Eksponentinis"
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr "Diapazonas"
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr "Cos"
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr "Atvirkštinė liestinė"
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr "Abipusis"
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr "Sveikasis skaičius"
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr "Vektoriaus kampas"
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr "Vektoriaus ilgis"
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr "Vektoriaus X"
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr "Vektoriaus Y"
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr "Gradiento spalva"
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr "Laiko eilutė"
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr "Realus"
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr "Faktinė eilutė"
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr "Jungtinis sąrašas"
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr "Kampo eilutė"
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr "Logaritmas"
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr "Pilka"
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr "Galia"
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr "Palyginti"
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr "Ne"
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr "Ir"
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr "Arba"
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr "Kaulo poveikis"
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr "Kaulas"
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr "Pagrindinis kaulas"
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr ""
 
@@ -3395,1319 +3504,1356 @@ msgstr ""
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ": Blogas tipas"
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr "Skaliarinis"
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr "IR"
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr "Jungtis1"
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr "Pirmas operandas IR operacijoje"
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr "Jungtis2"
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr "Antras operandas IR operacijoje"
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr "Tikslumas"
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr "Animacinis"
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr "X"
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr "Viršūnė %03d"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr "Poslinkis"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr "Fiksuotas ilgis"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr "Pločio mastelis"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr "Nelygybės kairioji pusė"
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr "Nelygybės dešinioji pusė"
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr "Didesnis"
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr "Lygus"
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr "Mažesnis"
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr "Blogas mišinio tipas"
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr "Raudona"
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr "Raudonos spalvos komponentas"
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr "Žalia"
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr "Žalios spalvos komponentas"
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr "Mėlyna"
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr "Mėlynos spalvos komponentas"
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr "Alfa"
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr "Spalvos alfa"
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr "Viršūnė 1"
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr "Segmento pirmoji viršūnė "
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr "Liestinė 1"
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr "Pirmoji segmento liestinė"
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr "Viršūnė 2"
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr "Segmento antroji viršūnė "
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr "Liestinė 2"
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr "Antroji segmento liestinė"
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr "X-ašis"
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr "Y-ašis"
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr "Viršūnė"
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr "Skaldyti"
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr "Interpoliuoti"
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr "Ilgis"
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr "Reikšmė"
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr "Amplitudė"
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr "Iš"
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr "Į"
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr "Galutinė indekso reikšmė"
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr "Prieš"
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr "Daugiklis"
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr "Po"
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr "Įvertinti"
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr "Ne"
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr "Arba"
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr "Šviesis"
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr "Vektoriaus ilgis"
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr "Min"
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr "Maks."
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr "Reali reikšmė negali būti konvertuojama"
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr "Pažymėti pradžią"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr "Pažymėti pabaigą"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr "Pradinė spalva"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr "Galutinė spalva"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+#, fuzzy
+msgid "The value to be reversed"
+msgstr "Reali reikšmė negali būti konvertuojama"
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr "Segmentas"
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr "Žingsnio trukmė"
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr "Pradžios laikas"
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr "Sankirta"
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr "Spalva 1"
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr "Spalva 2"
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr "Laikas"
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr "Linijinės interpoliacijos pabaigos laikas"
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr "Gradiento pradinė spalva"
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr "Gradiento galutinė spalva"
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr "Vektorius"
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr "Vektorius, kur kampas skaičiuojamas nuo"
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/nl.gmo b/po/nl.gmo
index a31ff32..d2552c4 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index 04602c1..a318639 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,10 +10,10 @@
 # Wouter Staelens, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/synfig/language/"
 "nl/)\n"
@@ -32,8 +32,9 @@ msgstr "Tekst"
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "Overige"
 
@@ -59,8 +60,9 @@ msgstr "Af te beelden tekst"
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "Kleur"
 
@@ -78,7 +80,7 @@ msgstr "Stijl"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr "Normaal"
 
@@ -91,7 +93,7 @@ msgid "Italic"
 msgstr "Cursief"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr "Gewicht"
 
@@ -161,9 +163,12 @@ msgstr "Tekst orientatie"
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr "Oorsprong"
 
@@ -197,7 +202,7 @@ msgstr "Schakelt deze optie uit als je de tekst animeert"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr "Inverteren"
 
@@ -243,27 +248,27 @@ msgid "Type of blur to use"
 msgstr "Type vervaging"
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr "Gebied vervagen"
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr "Snelle Gaussische vervaging"
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr "Kruis vervagen"
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr "Gaussische vervaging"
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr "Radiaal vervagen"
 
@@ -350,6 +355,7 @@ msgstr "Gebogen Warp"
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr "Vervorming"
 
@@ -360,13 +366,14 @@ msgstr "Positie van de spline-doellijn"
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr "Breedte"
 
@@ -424,7 +431,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr "Bestandsnaam is al vastgesteld op \"%s\" (%s)"
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr "Bestandsnaam"
 
@@ -432,7 +439,8 @@ msgstr "Bestandsnaam"
 msgid "File to import"
 msgstr "Te importeren bestand"
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr "Tijd offset"
 
@@ -599,7 +607,8 @@ msgstr "Offset buitenkant"
 msgid "Scale Outside"
 msgstr "Schaling buitenkant"
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr "Rotatie"
 
@@ -616,12 +625,13 @@ msgstr "Het punt waar de oorsprong moet liggen"
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr "Grootte"
 
@@ -643,7 +653,7 @@ msgid "Spherize"
 msgstr "Bolvormig"
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr "Positie"
 
@@ -658,7 +668,7 @@ msgstr "Centrum van de bolvormige verstoring "
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr "Straal"
 
@@ -762,12 +772,13 @@ msgstr "Beveilig alpha waarden"
 msgid "Avoid alpha artifacts when checked"
 msgstr "Indien aangevinkt, voorkomt alpha artifacten"
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr "Tijd lus"
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr "Link tijd"
 
@@ -775,16 +786,19 @@ msgstr "Link tijd"
 msgid "Start time of the loop for the cycled context"
 msgstr "Starttijd van de herhaling van cyclische inhoud"
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr "Lokale tijd"
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr "De starttijd voor de herhaling"
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr "Duur"
 
@@ -808,7 +822,8 @@ msgstr "Symmetrisch"
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr "Indien aangevinkt, spiegelt en centreert herhalingen op lokale tijd"
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr "Vertalen"
 
@@ -917,11 +932,12 @@ msgstr "Centrum van het patroon"
 msgid "Size of the pattern"
 msgstr "Afmetingen van het patroon"
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr "Schaal"
 
@@ -1011,13 +1027,14 @@ msgstr "Voorbeeld"
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr "Vulkleur van de laag"
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr "Punt 1"
 
@@ -1029,6 +1046,7 @@ msgstr "Eerste punt van de rechthoek"
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr "Punt 2"
 
@@ -1068,9 +1086,9 @@ msgstr "Metaballs"
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr "Gradient"
 
@@ -1134,7 +1152,7 @@ msgid "Blur"
 msgstr "Vervagen"
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr "Vervaagt"
 
@@ -1162,7 +1180,8 @@ msgstr "Contrast"
 msgid "Exposure Adjust"
 msgstr "Belichting aanpassen"
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr "Gamma aanpassen"
 
@@ -1262,7 +1281,8 @@ msgstr "Uitgebreide Omlijning"
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr "Geometrie"
 
@@ -1308,37 +1328,37 @@ msgstr "Bepaalt puntsoort van de eerste spline-punt als de spline ontknoopt is"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr "Afgerond uiteinde"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr "Vierkant uiteinde"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr "Puntvormig uiteinde"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr "Vlak uiteinde"
 
@@ -1373,14 +1393,15 @@ msgid "Smoothness"
 msgstr "Gladheid"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+#, fuzzy
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr "Bepaalt de interpolatie tussen punten. (0) Lineair (1) Effen"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr "Homogeen"
 
@@ -1451,7 +1472,8 @@ msgstr "Circel"
 msgid "Radius of the circle"
 msgstr "Straal van de circel"
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr "Pluim"
 
@@ -1474,8 +1496,9 @@ msgstr "Bepaalt de afval functie voor de pluim"
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr "Lineair"
 
@@ -1494,7 +1517,7 @@ msgstr "Sigmond"
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr "Cosinus"
 
@@ -1576,9 +1599,11 @@ msgstr "De straal van de binnenste punten in de ster"
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr "Hoek"
 
@@ -1664,10 +1689,10 @@ msgstr "Globale breedte van de gradient"
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr "Herhalen"
 
@@ -1810,32 +1835,32 @@ msgstr "Wijzigt de willekeurige seed waarde van de ruis"
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr "Interpolatie"
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr "Het type interpolatie"
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr "Dichtstbijzijnde buur "
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr "Kromme"
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr "Kubisch"
 
@@ -1893,13 +1918,20 @@ msgid "When checked the gradient is supersampled"
 msgstr "Indien aangevinkt, neemt een super monster van de gradient"
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr "Koppeling"
 
@@ -1921,6 +1953,7 @@ msgid "Seeds the random number generator"
 msgstr "De seed waarde voor de toevalsgenerator"
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr "Snelheid"
 
@@ -2015,8 +2048,9 @@ msgstr ""
 "Indien actief wordt het alfa kanaal van de gradient vermenigvuldigt met de "
 "stam grootte en wordt de afbeelding met een alfa waarde 1.0 gemaakt"
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr "Omkeren"
 
@@ -2024,8 +2058,9 @@ msgstr "Omkeren"
 msgid "If enabled, render the plant in the opposite direction"
 msgstr "Indien aangevinkt, laat de plant in de tegengestelde richting groeien"
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr "Stap"
 
@@ -2238,7 +2273,7 @@ msgstr "Importer::open(): Kan extensie niet bepalen"
 msgid "Importer::open(): Unknown file type -- "
 msgstr "Importer::open(): Onbekend bestandstype --"
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr "Kan doel laag niet maken"
 
@@ -2250,253 +2285,295 @@ msgstr "Z-diepte"
 msgid "Modifies the position of the layer in the layer stack"
 msgstr "Wijzigt de positie van de laag in de stapel"
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr "Boven-Links"
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr "Linker bovenhoek van de afbeelding"
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr "Beneden-Rechts"
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr "Onder rechterhoek van de afbeelding"
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr "Alfa kanaal van de laag"
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr "Meng methode"
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr "De meng methode die gebruikt wordt op onderliggende lagen"
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr "Kopieren"
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr "Index"
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr "Kopieer index"
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr "[MIME]"
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr "Bewegingsvervaging"
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr "Opening"
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr "Sluiter tijd"
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr "Submonsters factor"
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr "Vermenigvuldigt het aantal af te beelden submonsters"
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr "Submonster type"
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr "Soort kromme voor het wegen van submonsters"
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr "Constant"
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr "Hyperbolisch"
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr "Submonster start grootte"
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr "Relatieve grootte van het eerste submonster, voor lineaire weging"
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr "Submonster stop grootte"
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr "Relatieve grootte van het laatste submonster, voor lineaire weging"
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr "Tekenvenster"
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr "Groepeer inhoud"
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr "Tijd offset, toe te passen op deze context"
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr "Indien aangevinkt, voorkomt dat kinderen de muis kunnen gebruiken"
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr "Groei van buitenlijn"
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr "Exponentiële waarde breedte van onderliggende buitenlijnen"
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr "Huidige tijd"
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr "Polygon"
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr "Lijst Vertices"
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr "Definieert de hoeken van de polygon"
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr "Vorm"
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr "Intern"
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr "Kleur van de rand van de laag"
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr "Anti-aliasing"
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr "Methode van vervaging"
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr "De methode van vervaging die gebruikt wordt"
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr "Draai Stijl"
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr "De draai methode die gebruikt moet worden"
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr "Niet nul"
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr "Oneven/Even"
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr "Naam"
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+#, fuzzy
+msgid "First corner of the bounds rectangle"
+msgstr "Eerste punt van de rechthoek"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+#, fuzzy
+msgid "Second corner of the bounds rectangle"
+msgstr "Tweede punt van de rechthoek"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+#, fuzzy
+msgid "Horizontal subdivisions"
+msgstr "Horizontale witruimte"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr "Effen Kleur"
 
-#: src/synfig/layer_sound.cpp:51
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
-msgstr "Afgerond"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
-msgstr "Kan bestand niet openen"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr "Wissel"
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2801,7 +2878,7 @@ msgstr "\"author\" zonder waarde"
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr "Tekenvenster '%s' heeft de definitie van %s opgeheven: %s"
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr "ValueNode"
 
@@ -3003,8 +3080,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr "Samenstelling"
 
@@ -3044,13 +3121,13 @@ msgstr "Vermenigvuldigen"
 msgid "Divide"
 msgstr "Delen"
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr "Optellen"
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr "Aftrekken"
 
@@ -3066,12 +3143,14 @@ msgstr "Oplichten"
 msgid "Darken"
 msgstr "Verduisteren"
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr "Tint"
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr "Verzadiging"
 
@@ -3187,230 +3266,260 @@ msgstr ""
 "Time(): Tijdcode zonder eenheid en frame snelheid onbekend! SECONDEN wordt "
 "gebruikt"
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr "Radiele samenstelling"
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr "Referentie"
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr "Tangentieel segement"
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr "Segment punt"
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr "Strepen"
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr "Dubbel Schaduw"
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr "Dynamische Lijst"
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr "Rotatie gradient"
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr "Sinus"
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr "Tijdgebonden wissel"
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr "Herhalingsgradient"
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr "Exponentieel"
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr "Bereik"
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr "Cosinus"
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr "aTan2"
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr "Inverse tangens"
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr "Reciproke"
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr "Geheel getal"
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr "Vector hoek"
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr "Vector lengte"
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr "Vector X"
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr "Vector Y"
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr "Kleurgradient"
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr "Scalair product"
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr "Tijd naar tekst conversie"
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr "Reeele waarde"
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr "Waarde naar tekst conversie"
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr "Samengevoegde lijst"
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr "Hoek naar tekst conversie"
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr "Geheel getal naar tekst conversie"
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr "Logaritme"
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr "Grijs maken"
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr "Machtsverheffen"
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr "Vergelijken"
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr "Niet"
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr "En"
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr "Of"
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr "Bot"
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr "Basisbot"
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr "Botverbinding"
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr "Lijst afwijkende breedtes"
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr "DIList"
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr "Gemiddeld"
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr "Dynamisch"
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr "Afgeleid"
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr "Ongeldige waarde: ValueNode '%s' accepteer niet type '%s'"
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr "Vervanger"
 
@@ -3419,1287 +3528,1323 @@ msgstr "Vervanger"
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr "%s:%d ongeldig type voor %s: %s nodig maar %s gekregen"
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ":Ongeldig type"
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr "Een of meer van mijn parameters zijn niet ingevuld!"
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr "Linkerzijde"
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr "Linkerzijde van de optelling"
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr "Rechterzijde"
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr "Rechterzijde van de optelling"
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr "Scalair"
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr "De waarde waarmee de optelling wordt vermenigvuldigt"
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr "EN"
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr "Koppeling 1"
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr "De eerste waarde voor de AND operatie"
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr "Koppeling 2"
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr "De tweede waarde voor de AND operatie"
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr "Waarde die omgezet moet worden naar een tekenreeks"
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr "Grootte van de tekenreeks"
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr "Precisie"
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr "Het aantal decimale cijfers"
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr "Voorloop nullen"
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 "Indien aangevinkt, vult het begin van de tekenreeks aan met nullen tot de "
 "gewenste grootte"
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr "Er is al een tussen punt gedefinieerd op dit tijdstip"
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr ""
 "%s: Het is niet mogelijk om %s te gebruiken in een geanimeerde ValueNode"
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr "Animatie"
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr "x"
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr "Y"
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr "Sinus van de hoek"
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr "Geen waardes in lijst"
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr "Geen waardes in de terug gegeven lijst"
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr "Vertex %03d"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr "Indien aangevinkt, hergebruikt het aantal bij herhalingen"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr "Offset"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr "Hoek offset van de raaklijn"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr "Schaling van de raaklijn"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr "Vaste lengte"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr "Indien aangevinkt, houd de lengte van de raaklijn vast"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr "Schaling van de breedte"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr "De linkerzijde van de vergelijking"
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr "De rechterzijde van de vergelijking"
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr "Groter"
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 "Indien aangevinkt, levert waar op als de linkerzijde groter is dan de "
 "rechterzijde"
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr "Gelijk aan"
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 "Indien aangevinkt, levert waar op als de linkerzijde gelijk is aan de "
 "rechterzijde"
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr "Minder dan"
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 "Indien aangevinkt, levert waar op als de linkerzijde kleiner is dan de "
 "rechterzijde"
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr "Ongeldig type voor samenstelling"
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr "Rood"
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr "De rode component van de kleur waarde"
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr "Groen"
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr "De groene component van de kleur waarde"
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr "Blauw"
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr "De blauwe component van de kleur waarde"
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr "Alfa"
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr "De alfa component van de kleur waarde"
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr "Vertex 1"
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr "De eerste vertex van het segment"
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr "Raaklijn 1"
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr "De eerste raaklijn van het segment"
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr "Vertex 2"
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr "De tweede vertex van het segment"
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr "Raaklijn 2"
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr "De tweede raaklijn van het segment"
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr "X-as"
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr "De component op de x-as van de vector"
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr "Y-as"
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr "De component op de y-as van de vector"
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr "Vertex"
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr "Bepaalt de 'Aan' en 'Uit' positie relatief ten opzicht van de buren"
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr "Splitsing"
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr "Indien aangevinkt, maakt raaklijnen onafhankelijk"
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr "De waarde van de afwijkende breedte"
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr "Het soort zijkant voor"
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr "Bepaalt het soort interpolatie tussen punten met afwijkende breedtes"
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr "Interpolatie"
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr "Het soort zijkant na"
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr "Ondergrens"
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr "Bovengrens"
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr "Lengte"
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr "De lengte van de strepen"
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr "Bepaalt het type van de zijkant van de streep"
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr "Scheeftrekhoek"
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr "Waarde"
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr "Waarde om de cosinus te berekenen"
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr "Amplitude"
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr "Vermenigvuldigingswaarde voor de totale cosinus"
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr "Van"
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr "Beginwaarde van de index"
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr "Naar"
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr "Eindwaarde van de index"
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr "Toename per stap in de index"
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr "Lijst type of waarde type incorrect, foutieve waarde wordt weggegooid"
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr "Waarde %03d"
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr "Exponent"
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr "De waarde van de macht voor grondgetal 'e'"
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr "Vermenigvuldigingsfactor van de totale exponent"
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr "De te draaien brongradient "
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr "De waarde waarmee de gradient verschoven moet worden"
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr "De geheel getal waarde die geconverteerd moet worden"
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr "Tekenreeksen"
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr "De lijst met tekenreeksen die gekoppeld moet worden"
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr "Voor"
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr "De tekenreeks die voor de gekoppelde tekenreeksen wordt geplaatst"
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr "Scheidingsteken"
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr "De tekenreeks die tussen elke gekoppelde tekenreeks wordt geplaatst"
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr "Na"
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr "De tekenreeks die na de gekoppelde tekenreeksen wordt geplaatst"
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr "Snelheid"
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr "De waarde waarmee de huidige tijd (in seconden) wordt vermenigvuldigt"
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr "Helling"
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr "De waarde die wordt terug geleverd als de huidige tijd nul is"
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr "Epsilon"
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr "Oneindig"
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr "Waarde die wordt terug gegeven als het resultaat naar oneindig gaat"
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr "NIET"
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr "Waarde knoop gebruikt om de NIET operatie uit te voeren"
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr "OF"
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr "Waarde knoop gebruikt om de OF operatie uit te voeren"
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr "Grondtal"
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr "Het grondgetal bij machtsverheffen"
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr "De exponent bij machtsverheffen"
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 "Waarde die wordt gebruikt om het grondgetal of de macht met nul te "
 "vergelijken"
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr "Ongeldig type voor radiaal compositie"
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr "Helderheid"
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr "De lengte van de vector"
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr "Theta"
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr "De hoek van de vector met de x-as"
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr "Sommige van mijn parameters zijn niet ingevuld!"
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr "Minimum"
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr "Waarde die terug gegeven wordt als 'Link' kleiner is"
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr "Maximum"
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr "Waarde die terug gegeven wordt als 'Link' groter is"
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr "De waarde knoop waarmee het bereik wordt begrenst"
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 "The waarde knoop die gebruikt wordt voor berekening van de reciproque waarde "
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 "De waarde die gebruikt wordt om te bepalen of 'Link' te klein is om een "
 "reciproque te berekenen"
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr "De waarde die gebruikt wordt als 'Link' < 'Epsilon'"
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr "De referentie waarde"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr "De bron gradient die herhaald moet worden"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr "Teller"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr "Het aantal keren dat de gradient herhaald moet worden"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr "Specificeer Start"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 "Indien aangevinkt, gebruikt de start kleur voor het begin van de totale "
 "gradient"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr "Specificeer Einde"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 "Indien aangevinkt, gebruikt de eind kleur voor het begin van de totale "
 "gradient"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr "Start Kleur"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr "Wordt gebruikt als start van de totale gradient"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr "Eind Kleur"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr "Wordt gebruikt als einde van de totale gradient"
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+#, fuzzy
+msgid "The value to be reversed"
+msgstr "De geheel getal waarde die geconverteerd moet worden"
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 "Bezig met het bepalen van de inverse van een niet-omkeerbare waarde knoop"
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr "De waarde knoop die gebruikt wordt voor te schalen"
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr "Waarde waarmee de waarde knoop wordt vermenigvuldigt"
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr "Segment"
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr "Het segment waar de tangens aan gekoppeld is "
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr "De positie van de gekoppelde tangens op het segment (0,1]"
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr "Het segment waar de vertex aan gekoppeld is"
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr "De positie van de gekoppelde vertex op het segment (0,1]"
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr "De hoek voor de bepaling van de sinus"
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr "De waarde waarmee de sinus waarde wordt vermenigvuldigt"
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr "De waarde knoop die gebruikt wordt voor de stap"
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr "De lengte van de stap"
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr "Start tijd"
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr "De starttijd voor de getrapte conversie"
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr "Snijpunt"
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr "Kleur 1"
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr "Eerste kleur van de gradient strepen"
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr "Kleur 2"
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr "Tweede kleur van de gradient strepen"
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr "Aantal strepen"
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr "Aantal strepen in de gradient"
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr "Breedte van de strepen in de gradient tussen [0,1]"
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr "Linkerzijde van de aftrekking"
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr "Rechterzijde van de aftrekking"
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr "Vermenigvuldigingsfactor voor de aftrekking"
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr "Koppeling uit"
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr "De waarde knoop die terug gegeven wordt als de schakelaar uit is"
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr "Koppeling aan"
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr "De waarde knoop die terug gegeven wordt als de schakelaar aan is"
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 "Indien aangevinkt, levert de 'Koppeling Aan', anders de 'Koppeling Uit'"
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 "De waarde knoop die wordt teruggegeven als de huidige tijd ligt voor de "
 "waarde 'tijd' - 'lengte'"
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 "De waarde knoop teruggegeven als de huidige tijd voorbij de waarde 'tijd' "
 "ligt"
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr "Tijd"
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr "De tijd waarop de lineaire interpolatie moet stoppen"
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
@@ -4707,57 +4852,58 @@ msgstr ""
 "De lengte van de tijd bij het uitvoeren van de lineaire interpolatie tussen "
 "'Voor' en 'Na'"
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr "De waarde knoop om herhalingen te timen"
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr "De tijdwaarde die omgezet moet worden naar een tekenreeks"
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr "De start kelur van de gradient"
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr "De eind kleur van de gradient"
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr "Vector"
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr "De vector gebruikt bij het bepalen van de hoek"
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr "De vector gebruikt bij het bepalen van de lengte"
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr "De vector waar de x coördinaat van wordt gebruikt"
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr "De vector waar de y coordinaat van wordt gebruikt"
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr "Afwijkend Breedte Punt %03d"
diff --git a/po/no_NO.gmo b/po/no_NO.gmo
index e174f60..0a3377d 100644
Binary files a/po/no_NO.gmo and b/po/no_NO.gmo differ
diff --git a/po/no_NO.po b/po/no_NO.po
index 96c5c1a..265af24 100644
--- a/po/no_NO.po
+++ b/po/no_NO.po
@@ -7,10 +7,10 @@
 # NordicTroll <blenderkurs at gmail.com>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Norwegian (Norway) (http://www.transifex.com/projects/p/"
 "synfig/language/no_NO/)\n"
@@ -29,8 +29,9 @@ msgstr "Tekst"
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "Annet"
 
@@ -56,8 +57,9 @@ msgstr "tekst til og Rendre"
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "Farge"
 
@@ -75,7 +77,7 @@ msgstr "Stil"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr "Normal"
 
@@ -88,7 +90,7 @@ msgid "Italic"
 msgstr "kursiv"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr "vekt"
 
@@ -158,9 +160,12 @@ msgstr "Tekstretning"
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr "Origo"
 
@@ -194,7 +199,7 @@ msgstr "Slå dette av hvis du skal animere teksten"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr "Inverter"
 
@@ -239,27 +244,27 @@ msgid "Type of blur to use"
 msgstr "Type utvisker å bruke"
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr "Boks Utvisking"
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr "Rask Gaussian Utvisking "
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr "Firkanttasten Utvisking"
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr "Gaussian Utvisking "
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr "Disk Utvisking"
 
@@ -346,6 +351,7 @@ msgstr ""
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr ""
 
@@ -356,13 +362,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr ""
 
@@ -420,7 +427,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr ""
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr ""
 
@@ -428,7 +435,8 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr ""
 
@@ -595,7 +603,8 @@ msgstr ""
 msgid "Scale Outside"
 msgstr ""
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr ""
 
@@ -612,12 +621,13 @@ msgstr ""
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr ""
 
@@ -639,7 +649,7 @@ msgid "Spherize"
 msgstr ""
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr ""
 
@@ -654,7 +664,7 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr "Radius"
 
@@ -758,12 +768,13 @@ msgstr ""
 msgid "Avoid alpha artifacts when checked"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr ""
 
@@ -771,16 +782,19 @@ msgstr ""
 msgid "Start time of the loop for the cycled context"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr ""
 
@@ -804,7 +818,8 @@ msgstr ""
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr ""
 
@@ -913,11 +928,12 @@ msgstr ""
 msgid "Size of the pattern"
 msgstr ""
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr ""
 
@@ -1007,13 +1023,14 @@ msgstr "Eksempel"
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr "Lagets farge belegg"
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr "Punkt 1"
 
@@ -1025,6 +1042,7 @@ msgstr "Første hjørne av rektangele"
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr "Punkt 2"
 
@@ -1064,9 +1082,9 @@ msgstr "Metakuler"
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr "Gradient"
 
@@ -1130,7 +1148,7 @@ msgid "Blur"
 msgstr ""
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr ""
 
@@ -1158,7 +1176,8 @@ msgstr ""
 msgid "Exposure Adjust"
 msgstr ""
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr ""
 
@@ -1258,7 +1277,8 @@ msgstr ""
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr ""
 
@@ -1304,37 +1324,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr ""
 
@@ -1368,14 +1388,14 @@ msgid "Smoothness"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr ""
 
@@ -1443,7 +1463,8 @@ msgstr ""
 msgid "Radius of the circle"
 msgstr ""
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr ""
 
@@ -1466,8 +1487,9 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr ""
 
@@ -1486,7 +1508,7 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr ""
 
@@ -1566,9 +1588,11 @@ msgstr ""
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr ""
 
@@ -1654,10 +1678,10 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr ""
 
@@ -1800,32 +1824,32 @@ msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr ""
 
@@ -1883,13 +1907,20 @@ msgid "When checked the gradient is supersampled"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr ""
 
@@ -1911,6 +1942,7 @@ msgid "Seeds the random number generator"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr ""
 
@@ -1995,8 +2027,9 @@ msgid ""
 "size, and an alpha of 1.0 is used when rendering"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr ""
 
@@ -2004,8 +2037,9 @@ msgstr ""
 msgid "If enabled, render the plant in the opposite direction"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr ""
 
@@ -2216,7 +2250,7 @@ msgstr ""
 msgid "Importer::open(): Unknown file type -- "
 msgstr ""
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr ""
 
@@ -2228,251 +2262,295 @@ msgstr ""
 msgid "Modifies the position of the layer in the layer stack"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr ""
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+#, fuzzy
+msgid "First corner of the bounds rectangle"
+msgstr "Første hjørne av rektangele"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+#, fuzzy
+msgid "Second corner of the bounds rectangle"
+msgstr "Andre hjørne av rektanglet"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+#, fuzzy
+msgid "Horizontal subdivisions"
+msgstr "Horisontal avstand"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:51
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2768,7 +2846,7 @@ msgstr ""
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr ""
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr ""
 
@@ -2970,8 +3048,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr ""
 
@@ -3011,13 +3089,13 @@ msgstr ""
 msgid "Divide"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr ""
 
@@ -3033,12 +3111,14 @@ msgstr ""
 msgid "Darken"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr ""
 
@@ -3152,230 +3232,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr ""
 
@@ -3384,1319 +3494,1355 @@ msgstr ""
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+msgid "The value to be reversed"
+msgstr ""
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/pl_PL.gmo b/po/pl_PL.gmo
index 91e3efa..f7a0c04 100644
Binary files a/po/pl_PL.gmo and b/po/pl_PL.gmo differ
diff --git a/po/pl_PL.po b/po/pl_PL.po
index c0247b7..7b1dc6b 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -6,6 +6,7 @@
 # Adam Humienny <adam.humienny at gmail.com>, 2014-2015
 # Adam Humienny <adam.humienny at gmail.com>, 2014
 # darkhog <rave002 at o2.pl>, 2011
+# kajetan <przemw at gmail.com>, 2015
 # szamanx01 <szamanx01 at gmail.com>, 2012-2013
 # Piotr Woznicki <wozniax1 at wp.pl>, 2013
 # darkhog <rave002 at o2.pl>, 2011
@@ -14,10 +15,10 @@
 # szamanx01 <szamanx01 at gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/synfig/"
 "language/pl_PL/)\n"
@@ -37,8 +38,9 @@ msgstr "Tekst"
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "Inne"
 
@@ -64,8 +66,9 @@ msgstr "Tekst do renderowania"
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "Kolor"
 
@@ -83,7 +86,7 @@ msgstr "Styl"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr "Narmalny"
 
@@ -96,7 +99,7 @@ msgid "Italic"
 msgstr "Kursywa"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr "Wytłuszczenie"
 
@@ -166,9 +169,12 @@ msgstr "Orientacja tekstu"
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr "Punkt pochodzenia"
 
@@ -202,7 +208,7 @@ msgstr "Wyłącz tę opcję jeśli będziesz animował tekst"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr "Odwróć"
 
@@ -248,27 +254,27 @@ msgid "Type of blur to use"
 msgstr "Typ rozmycia"
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr "Rozmycie pudełkowe"
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr "Szybkie rozmycia Gaussa"
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr "Rozmycie Cross-Hatch"
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr "Rozmycie Gaussa"
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr "Rozmycie dyskowe"
 
@@ -355,6 +361,7 @@ msgstr "Odkształcenie krzywej"
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr "Zniekształcenia"
 
@@ -365,13 +372,14 @@ msgstr "Pozycja przeznaczenia linii krzywej"
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr "Szerokość"
 
@@ -429,7 +437,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr "Nazwa pliku już ustawiona na \"%s\" (%s)"
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr "Nazwa pliku"
 
@@ -437,7 +445,8 @@ msgstr "Nazwa pliku"
 msgid "File to import"
 msgstr "Plik do importu"
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr "Przesunięcie w czasie"
 
@@ -451,7 +460,7 @@ msgstr "Na lewą stronę"
 
 #: src/modules/lyr_std/insideout.cpp:163
 msgid "Defines where the center will be"
-msgstr ""
+msgstr "Określa, gdzie będzie środek "
 
 #: src/modules/lyr_std/julia.cpp:56
 msgid "Julia Set"
@@ -604,7 +613,8 @@ msgstr "Przesunięcie zewnętrznej części"
 msgid "Scale Outside"
 msgstr "Skala zewnętrznej części"
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr "Obrót"
 
@@ -621,12 +631,13 @@ msgstr "Punkt \"pochodzenia\" obiektu"
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr "Wartość"
 
@@ -648,7 +659,7 @@ msgid "Spherize"
 msgstr "Sferyczne"
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr "Pozycja"
 
@@ -663,7 +674,7 @@ msgstr "Centrum zniekształcenia sferycznego"
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr "Promień"
 
@@ -767,12 +778,13 @@ msgstr "Uwzględnij alfę"
 msgid "Avoid alpha artifacts when checked"
 msgstr "Zaznaczone: Unikaj artefaktów kanału alfa"
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr "Pętla czasu"
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr "Czas początkowy"
 
@@ -780,16 +792,19 @@ msgstr "Czas początkowy"
 msgid "Start time of the loop for the cycled context"
 msgstr "Czas od którego pętla ma się rozpocząć wewnątrz obiektu"
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr "Czas lokalny"
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr "Czas startu pętli wynikowej"
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr "Czas trwania"
 
@@ -814,7 +829,8 @@ msgstr "Symetryczna"
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr "Gdy zaznaczone, pętle są dublowane wokół czasu lokalnego"
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr "Przenieś"
 
@@ -923,11 +939,12 @@ msgstr "Centrum wzoru"
 msgid "Size of the pattern"
 msgstr "Rozmiar wzoru"
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr "Skala"
 
@@ -1017,13 +1034,14 @@ msgstr "Przykład"
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr "Wypełnij kolorem warstwy"
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr "Punkt 1"
 
@@ -1035,6 +1053,7 @@ msgstr "Pierwszy róg prostokąta"
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr "Punkt 2"
 
@@ -1074,9 +1093,9 @@ msgstr "Metaballe"
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr "Gradient"
 
@@ -1144,7 +1163,7 @@ msgid "Blur"
 msgstr "Rozmycie"
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr "Rozmycia"
 
@@ -1172,7 +1191,8 @@ msgstr "Kontrast"
 msgid "Exposure Adjust"
 msgstr "Regulacja naświetlenia"
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr "Dopasowanie gamma "
 
@@ -1272,7 +1292,8 @@ msgstr "Zaawansowany kontur"
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr "Geometria"
 
@@ -1319,37 +1340,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr "Zatrzymaj zaokrąglanie"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr "Zatrzymaj potęgowanie"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr "Zatrzymaj wierzchołek"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr "Zatrzymaj płaszczyznę"
 
@@ -1384,14 +1405,15 @@ msgid "Smoothness"
 msgstr "Gładkość"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+#, fuzzy
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr "Określa interpolację pomiędzy punktami. (0) Liniowy (1) Gładki"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr "Homogeniczny"
 
@@ -1459,7 +1481,8 @@ msgstr "Okrąg"
 msgid "Radius of the circle"
 msgstr "Promień okręgu"
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr "Rozmycie krawędzi"
 
@@ -1482,8 +1505,9 @@ msgstr "Określa funkcję zanikania"
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr "Liniowa"
 
@@ -1502,7 +1526,7 @@ msgstr "Sigmond"
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr "Cosinus"
 
@@ -1582,9 +1606,11 @@ msgstr "Odległość do wewnętrznych punktów od środka gwiazdy"
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr "Kąt"
 
@@ -1670,10 +1696,10 @@ msgstr "Szerokość globalna gradientu"
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr "Pętla"
 
@@ -1816,32 +1842,32 @@ msgstr "Zmień by zmodyfikować losowe rozsianie szumu"
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr "Interpolacja"
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr "Jakiego typu interpolacji użyć"
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr "Najbliższego sąsiada"
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr "Krzywa"
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr "Sześcienna"
 
@@ -1899,13 +1925,20 @@ msgid "When checked the gradient is supersampled"
 msgstr "Po zaznaczeniu gradient jest supersamplem"
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr "Link"
 
@@ -1927,6 +1960,7 @@ msgid "Seeds the random number generator"
 msgstr "Wypełnienie generatora liczb pseudo-losowych"
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr "Prędkość"
 
@@ -2014,8 +2048,9 @@ msgstr ""
 "Jeżeli włączone, a kanał z gradientem jest mnożona przez wielkość trzpienia "
 "i alfa 1.0, jest używany podczas renderingu"
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr "Odrwóć"
 
@@ -2023,8 +2058,9 @@ msgstr "Odrwóć"
 msgid "If enabled, render the plant in the opposite direction"
 msgstr "Gdy zaznaczone renderuje roślinę w przeciwną stronę"
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr "Kroki"
 
@@ -2239,7 +2275,7 @@ msgstr "Importer::open(); Nie znaleziono wyrażenia"
 msgid "Importer::open(): Unknown file type -- "
 msgstr "Importer::open(); Nieznany typ pliku --"
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr "Nie można utworzyć powierzchni celu"
 
@@ -2251,253 +2287,296 @@ msgstr "Głębia Z"
 msgid "Modifies the position of the layer in the layer stack"
 msgstr "Zmienia pozycję warstwy na stosie warstw"
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr "Górny-lewy"
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr "W górnym lewym rogu obrazu "
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr "Dolny-prawy"
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr "W dolnym prawym rogu obrazu"
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr "Kanał alfa warstwy"
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr "Metoda łączenia"
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr "Metoda łączenia wykorzystana do złożenia na warstwach poniżej"
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr "Duplikat"
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr "Indeks"
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr "Kopiuj ndeks"
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr "[MIME]"
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr "Zamazanie ruchu"
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr "Apertura"
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr "Czas migawki"
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr "Współczynnik subsampli"
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr "Mnoży liczbę wyrenderowanych subsampli"
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr "Typ subsampli"
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr "Krzywa typu warzonego podpróbki"
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr "Stała"
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr "Hiperboliczny"
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr "Wartość startowa podpróbki"
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr "Względna ilość pierwszej podpróbki, do liniowego Obciążania"
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr "Wartość końcowa podpróbki"
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr "Względna ilość ostatniej podpróbki dla liniowego obciążenia"
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr "Pozycja przesunięcia"
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr "Transformacja"
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr "Pozycja, rotacja, pochylenie i skala"
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr "Canvas"
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr "Grupa treści"
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr "Przesunięcie w czasie do zastosowania w kontekście"
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
-msgstr ""
+msgstr "Blokada zaznaczenia"
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr "Po zaznaczeniu zapobiega wybrać dzieci za pomocą kliknięcia myszy"
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr "Kontur rosnący"
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr "Wartość wykładnicza wzrostu szerokości warstwy dzieci konturu"
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr "Aktualny czas"
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr "Wielobok"
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr "Lista wierzchołków"
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr "Określ boki wieloboku"
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr "Kształt"
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr "Wewnętrzny"
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr "Warstwa_kształt_kolor"
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr "Antyaliasing"
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr "Typ pióra"
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr "Typ upierzenia"
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr "Styl skrzydła"
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr "Styl uskrzydlenia"
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr "Nie zerowa"
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr "Parzysta/Nieparzysta"
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr "Szkielet"
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr "Kości"
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+#, fuzzy
+msgid "Skeleton Deformation"
+msgstr "Transformacja"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+#, fuzzy
+msgid "First corner of the bounds rectangle"
+msgstr "Pierwszy róg prostokąta"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+#, fuzzy
+msgid "Second corner of the bounds rectangle"
+msgstr "Drugi róg prostokąta"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+#, fuzzy
+msgid "Horizontal subdivisions"
+msgstr "Poziome odstępy między znakami"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr "Stały kolor"
 
-#: src/synfig/layer_sound.cpp:51
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
-msgstr "Zaokrąglony"
+msgstr "Dżwięk"
 
-#: src/synfig/layer_sound.cpp:102
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
-msgstr "Nie można otworzyć pliku"
+msgstr "Ścieżka do pliku dźwiękowego"
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
-msgstr ""
+msgstr "opóźnienie"
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
-msgstr ""
+msgstr "Opóźnienie przed odtwarzaniem"
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
-msgstr ""
+msgstr "Głośność"
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
-msgstr ""
+msgstr "Głośność dźwięku"
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr "Przełącznik"
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr "Nazwa aktywnej warstwy"
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr "Tylko warstwa o określonej nazwie jest widoczna"
 
@@ -2803,7 +2882,7 @@ msgstr "pusty \"autor\" jednostki"
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr "Obwiednia '%s' jest niezdefiniowana %s: %s"
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr "Wartość węzła"
 
@@ -3005,8 +3084,8 @@ msgstr "%s nie wydaje się być ważny %s plik palety"
 msgid "%s does not appear to be a supported palette file"
 msgstr "%s nie wydaje się być obsługiwany plik palety"
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr "Złożony"
 
@@ -3046,13 +3125,13 @@ msgstr "mnożenie"
 msgid "Divide"
 msgstr "Podzielić"
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr "Odejmij"
 
@@ -3068,12 +3147,14 @@ msgstr "Rozjaśnianie"
 msgid "Darken"
 msgstr "Przyciemianie"
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr "Barwa"
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr "Nasycenie"
 
@@ -3191,230 +3272,260 @@ msgstr ""
 "Czas(): Nie umieszczono w kodzie jednostki czasu i szybkości klatek! "
 "Zakładając sekundy"
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr "Promieniowe kompozytowe"
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr "Odniesienie"
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr "Odcinek stycznej"
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr "Odcinek wierzchołka"
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr "Paski"
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr "Dwukolorowe"
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr "Dynamiczna lista"
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr "Obróć gradient"
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr "Sinus"
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr "Zmienne czasowe"
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr "Powtórz gradient"
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr "Wykładniczy"
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr "Styczna krzywej"
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr "Wierzchołek krzywej"
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr "Zakres"
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr "Cos"
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr "aTan2"
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr "Odwrócone styczne "
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr "Wzajemne"
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr "Liczba całkowita"
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr "Szerokość krzywej"
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr "Kąt wektora"
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr "Długość wektora"
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr "Wektor X"
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr "Wektor Y"
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr "Kolor gradientu"
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr "Produkt skalarny"
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr "Ciąg czasu"
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr "Prawdziwy"
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr "Ciąg rzeczywisty"
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr "Lista złączeń"
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr "Kąt całkowity"
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr "Ciąg liczb całkowitych"
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr "Logarytm"
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr "Szaro"
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr "Włącz"
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr "porównaj"
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr "Nie"
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr "i"
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr "lub"
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr "Działanie kości"
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr "Kość"
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr "Główna kość"
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr "Statyczna lista"
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr "Waga pary kości"
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr "Linia kości"
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr "ListaWP"
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr "ListaDI"
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr "Średnia"
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr "Średnia ważona"
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr "Dynamiczna"
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr "Pochodna"
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr "Zły typ: ValueNode '%s' nie akceptuje typu '%s'"
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr "Zastępczy"
 
@@ -3423,1327 +3534,1364 @@ msgstr "Zastępczy"
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr "%s:%d zły typ dla %s: potrzebny %s , ale dostaje %s"
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ":Zły typ"
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr "Jeden lub oba parametry nie są!"
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr "LHS"
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr "Dodaj lewą stronę"
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr "RHS"
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr "Dodaj prawą stronę"
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr "Wartość skalarna"
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr "Wartość, która mnoży dodatek"
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr "I"
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr "Łącze1"
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr "Pierwszy argument z operacji AND"
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr "Łącze2"
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr "Drugi argument z operacji AND"
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr "Wartość do konwersji ciągu"
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr "Szerokość łańcucha"
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr "Precyzja"
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr "Liczba miejsc po przecinku"
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr "Zmierza do zera"
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr "Gdy zaznaczone, ciąg jest wypełniona zerami z lewej do szerokości"
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr "Punkt nawigacyjny istnieje w tym punkcie czasu"
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr "%s: Nie można użyć %s w animowanym WartośćWęzła"
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr "Animowany"
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr "X"
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr "Cosinus kąta"
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr "Y"
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr "Sinus kąta"
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr "Brak wpisów na liście"
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr "Nie ma wartości na ret_liście"
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr "Wierzchołek %03d"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr "Krzywa gdzie styczna jest związana"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr "Po zaznaczeniu zapętla ilość"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr "Położenie połączonej stycznej w krzywej (0,1]"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr "Przesunięcie"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr "Kąt przesunięcia stycznej"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr "Skala stycznej"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr "Stała długość"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr "Gdy zaznaczone, długość stycznej jest stała"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr "Gdy zaznaczone, styczna jest na bazie kąta"
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr "Krzywa gdzie wierzchołek jest związany"
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr "Położenie połączonego wierzchołka w krzywej (0,1]"
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr "Gdy zaznaczone, pozycja jest na bazie kąta"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr "Krzywa której szerokość jest związana do "
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr "Położenie połączonej szerokości w krzywej (0,1]"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr "Skala szerokości"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr "Gdy zaznaczone, długość krzywej w oparciu"
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr "Opisywana styczna do odwrócenia"
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr "Jeśli zaznaczone, odniesienie jest odwrucone "
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr "Kość %d"
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr "Nazwa kości"
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr "Rodzic"
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr "Kość z kości rodzica"
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr "Obracanie początku kości względem kości jego rodzica"
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr "Kąt obracanie względem kości jego rodzica"
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr "Lokalna długość skali"
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr "Skala kości dostosowane do jego długości"
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr "Szerokość kości"
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr "Szerokość kości w oryginale"
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr "Długość skali rekurencyjna"
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr "Skala kości i jej dzieci dostosowana do długości"
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr "Szerokość końcówki"
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr "Szerokość na końcu kości"
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr "Z-Głębokość"
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr "Z-głębokość kości"
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr "Długość ustawień"
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr "Konfiguracja długości kości"
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr "Rdzeń"
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr "Lista wagi kości"
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr "Lista kości używana do obliczania wpływu"
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr "Wartość węzła jest pod wpływem kości"
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr "Połączone kości"
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr "Wartość bazowa"
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr "Dodaj tłumaczenie"
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr "Dodaj obrót"
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr "Krzywa"
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr "Twórz krzywą"
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr "Skala X"
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr "Dodaj do skalowanie w osi X"
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr "Skala Y"
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr "Dodaj do skalowania w osi Y"
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr "Kość używana do działania"
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr "waga"
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr "Wartość względnego wpływu kości"
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr "Lewa strona porównana"
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr "Prawa strona porównana"
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr "Większy"
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr "Gdy zaznaczone, zwraca true jeśli LHS> RHS"
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr "Równy"
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr "Gdy zaznaczone, zwraca true jeśli LHS = RHS"
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr "Mniej"
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr "Gdy zaznaczone, zwraca true jeśli LHS < RHS"
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr "Zły typ kompozycji"
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr "Czerwony"
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr "Składnik czerwonego zabarwienia"
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr "Zielony"
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr "Składnik zielonego koloru"
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr "Niebieski"
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr "Składnik niebieskiego koloru"
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr "Alfa"
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr "Barwa alfy"
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr "Wierzchołek 1"
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr "Pierwszy wierzchołek segmentu"
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr "Styczna 1"
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr "Pierwsza styczna segmentu"
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr "Wierzchołek 2"
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr "Drugi wierzchołek segmentu"
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr "Styczna 2"
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr "Druga styczna segmentu"
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr "Oś X"
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr "Składnik osi X wektora"
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr "Oś Y"
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr "Składnik osi Y wektora"
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr "Wierzchołek"
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr "Wierzchołek punktów krzywej"
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr "Szerokość punktu krzywej"
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr "Definiuje pozycję włączenia i wyłączenia w stosunku do sąsiadów"
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr "Podział"
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr "Po zaznaczeniu styczne są niezależne"
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr "Styczna z pierwszego punktu krzywej"
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr "Druga styczna z punktu krzywej"
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr "Promień szczeliny"
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr "Gdy zaznaczone,  promienie stycznej są niezależna"
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr "Kąt szczeliny"
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr "Gdy zaznaczone, kąt szczeliny jest niezależny"
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr "[0,1] położenie szerokości punktu nad krzywą"
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr "Szerokość punktu szerokości"
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr "Typ strony przed"
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr "Określa rodzaj interpolacji szerokości punktu"
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr "Interpolować"
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr "Typ strony po"
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr "Ulubiona granica"
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr "Określa pozycję początku krzywej"
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr "Górna granica"
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr "Określa pozycję końca krzywej"
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr "Długość przesunięcia elementu kreska nad krzywą"
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr "Długość"
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr "Długość elementów kreski"
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr "Ustawia rodzaj bocznej pozycji rozdzielczej"
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr "Przesunięcie komponentu w transformacji"
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr "Kąt komponentu w transformacji"
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr "Kąt skosu"
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr "Kąt skoku komponentu w transformacji"
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr "Skala komponentu w transformacji"
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr "Masa wartości"
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr "Wartość"
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr "Wartość"
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr "Pierwszy"
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr "Pierwsza wartość"
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr "Drugi"
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr "Druga wartość"
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr "Wartość do obliczania cosinusa"
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr "Amplituda"
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr "Mnożnik powstałego cosinusa"
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr "Wartość do obliczania pochodnej"
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr "Interwał"
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr "Odstęp czasu do obliczenia różnic skończonych"
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr "Dokładność"
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr "Dokładność pochodnej"
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr "Szorstki"
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr "dobrze"
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr "Exstremum"
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr "Zamów"
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr "Zamówienie pochodnej"
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr "Pierwsza pochodna"
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr "Druga pochodna"
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr "Pozycja %03d"
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr "Lewa strona iloczynu skalarnego"
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr "Prawa strona iloczynu skalarnego"
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr "z"
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr "Wartość początkowa indeksu"
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr "do"
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr "Końcowa wartość indeksu"
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr "Ilość przyrostu indeksu"
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr "Wskazówka statyczna"
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr "Równowaga wskaźnika pozycji bez sił zewnętrznych"
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr "Fundament systemu dynamicznego"
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr "Siła"
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr "Siła zewnętrzna, stosowane w środku ciężkości masy"
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr "Moment"
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr "Moment zewnętrzny stosowany w środku bezwładności"
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr "Współczynnik tłumienia"
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr "Promieniowy współczynnik tłumienia dynamicznego układu"
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr "Współczynnik tarcia"
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr "Współczynnik obrotowy tarcia układu dynamicznego"
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr "Współczynnik sprężystości"
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
-msgstr ""
+msgstr "Promieniowy wskaźnik systemu dynamicznego"
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr "Współczynnik skręcania"
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr "Współczynnik skręcania układu dynamicznego"
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr "Masa"
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr "Masa dynamicznego systemu"
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr "Moment bezwładności"
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr "Moment bezwładności układu dynamicznego"
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr "Sztywna sprężyna"
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr "Gdy zaznaczone, liniowa sprężyna jest sztywna"
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr "Skręcanie sztywne"
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr "Gdy zaznaczone, skręcona sprężyna jest sztywna"
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr "Początek ciągnie koniec"
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 "Jeśli zaznaczone, wynik jest sumą początku + końce, inaczej tylko wierzchołek"
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
-msgstr ""
+msgstr "Typ listy / typ elementu niedopasowany, usuń niedopasowanie"
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr "Pozycja %03d"
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr "Wykładnik potęgi"
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr "Wartości, aby podnieść stałą 'e'"
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr "Mnożnik powstałego wykładnika"
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr "Gradient, gdzie kolor jest pobierany z"
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr "Pozycja barwy w gradiencie stężeń (0,1]"
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr "Gdy zaznaczone, wskaźnik pętli"
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr "Obróć źródło gradientu "
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr "Wartość do wyrównania gradientu"
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr "Wartość szarości"
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr "Wartość liczby całkowitej zostanie zmieniona"
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr "całkowite"
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr "Ciągi"
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr "Lista ciągów do przyłączenia"
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr "Przed"
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr "Ciąg do umieszczenia przed przyłączonym ciągiem"
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr "Separator"
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr "Ciąg do umieszczenia pomiędzy każdym przyłączonym ciągiem"
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr "po"
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr "Ciąg do umieszczenia po przyłączonym ciągiu"
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr "tempo"
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr "Wartość jest mnożona w bieżącym czasie (w sekundach)"
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr "nachylenie"
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr "Wartość zwracana, gdy aktualny czas jest zero"
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr "Wartość źródłowa stosowana do obliczania logarytmu Neperian"
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr "Epsilon"
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr "Wartość użyta do porównania 'linku' od zera"
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr "Nieskończony"
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr "Wartość zwracana, gdy wynik wydaje się nieskończony"
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr "NIE"
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr "Wartość źródłowa stosowana do operacji NOT"
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr "LUB"
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr "Wartość źródłowa stosowana do operacji logicznej OR"
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr "Podstawa"
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr "Podstawa podniesiona do potęgi"
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr "Moc używana do podniesienia bazy"
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr "Wartość użyta do porównania bazy między zerem a maksimum"
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr "Zły typ dla kompozycji promieniowej"
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr "Luma"
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr "Długość wektora"
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr "Theta"
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr "Kąt wektora z osią X"
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr "Niektórych z moich parametrów nie ma!"
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr "Minimum"
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr "Wartość zwracana, gdy 'Link' jest mniejszy"
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr "Maksimum"
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr "Wartość zwracana, gdy 'Link' jest większy"
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr "Ogranicz zakres wartości węzła "
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr "Prawdziwa wartość do konwersji"
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr "Wartość źródłowa stosowana do obliczania jego odwrotności"
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 "Wartość używana do zdecydować, czy \"link\" jest zbyt mały, aby uzyskać jego "
 "odwrotność"
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr "Otrzymaną wartość kiedy 'Link' < 'Epsilon'"
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr "Wartość odniesienia"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
-msgstr "Powtórz źrudło gradientu"
+msgstr "Powtórz źródło gradientu"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr "Zlicz"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr "Liczba powtórzeń gradientu"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 "Określa, jak bardzo stronniczy jest gradient źródłowy w powtarzaniu [0,1]"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr "Określ początek"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 "Zaznaczenie 'start kolor' jest stosowane jako początek powstałego gradientu"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr "Określ koniec"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 "Zaznaczenie 'Koniec koloru' jest stosowane jako początek powstałego gradientu"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr "Kolor startowy"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr "Używany jako początek otrzymanego gradientu"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr "Kolor końcowy"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr "Używany jako koniec otrzymanego gradientu"
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+#, fuzzy
+msgid "The value to be reversed"
+msgstr "Prawdziwa wartość do konwersji"
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr "Próbuje uzyskać odwrotność nie odwracalnej wartości źródłowej "
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr "Wartość źródłowa stosowana do skali"
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr "Wartość, która mnoży wartość węzła"
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr "Odcinek"
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr "Odcinek gdzie styczna jest związana"
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr "Położenie połączonej stycznej w segmencie (0,1]"
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr "Segment gdzie wierzchołek jest związany z"
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr "Położenie wierzchołka połączone w segmencie (0,1]"
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr "Kąt gdzie sinus jest obliczany z "
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr "Wartość, która mnoży sinus wynikowy"
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr "Wartość źródłowa stosowana do następnego kroku"
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr "Czas trwania etapu"
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr "Czas startu"
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr "Czas, kiedy rozpoczyna się etap konwersji"
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr "Punkt przecięcia"
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr "Wartość, która określa, czy etap koncentruje się na wartości [0,1]"
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr "Kolor 1"
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr "Jeden kolor z gradientu paskowego"
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr "Kolor 2"
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr "Inny kolor z gradientu paskowego"
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr "Suma pasków"
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr "Ilość pasów w gradiencie"
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr "Szerokość pasów w gradiencie między [0,1]"
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr "Lewa strona odejmowania"
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr "Prawa strona odejmowania"
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr "Wartość, która mnoży odejmowanie"
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr "Link wyłączony"
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr "Wartość węzła zostanie zwrócona kiedy przełączysz na off "
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr "Link włączony"
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr "Wartość węzła zostanie zwrócona kiedy przełączysz na on"
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 "Gdy zaznaczone, zwraca 'link włączony\", w przeciwnym wypadku zwraca' link "
 "wyłączony\""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr "Czas"
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr "Wartość węzła w pętli czasu"
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr "Długość pętli"
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr "Kolor początkowy gradientu"
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr "Kolor końcowy gradientu"
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr "Wektor"
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr "Wektor gdzie kąt jest obliczany z"
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr "Wektor w którym długość jest obliczana z"
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr "Wektor gdzie współrzędna X ekstrahuje się z"
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr "Wektor gdzie współrzędna Y ekstrahuje się z"
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr "Średnia ważona"
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
@@ -4870,7 +5018,7 @@ msgstr "Dołącz warstwy <filename> do kompozycji"
 
 #: src/tool/main.cpp:178
 msgid "Print out specified details of the root canvas"
-msgstr ""
+msgstr "Drukuj wybrane szczegóły obszaru roboczego"
 
 #: src/tool/main.cpp:179 src/tool/main.cpp:205
 msgid "Print out the list of exported canvases in the composition"
@@ -4951,7 +5099,7 @@ msgstr "Test zaimplementowanego sygnału"
 
 #: src/tool/main.cpp:247
 msgid "Try 'synfig --help' for more information"
-msgstr ""
+msgstr "Spróbuj 'Synfig --help ' aby uzyskać więcej informacji"
 
 #: src/tool/joblistprocessor.cpp:73
 msgid "Nothing to do!"
@@ -4963,7 +5111,7 @@ msgstr "Próba określenia cel/plik_wyjściowy"
 
 #: src/tool/joblistprocessor.cpp:90
 msgid "Target name undefined, attempting to figure it out"
-msgstr ""
+msgstr "Nazwa docelowa niezdefiniowana, spróbuj to zrozumieć"
 
 #: src/tool/joblistprocessor.cpp:120
 msgid "Defaulting to PNG target..."
@@ -5125,7 +5273,7 @@ msgstr ""
 
 #: src/tool/optionsprocessor.cpp:480
 msgid "Target bitrate set to: "
-msgstr ""
+msgstr "Docelowy bitrate ustawić na:"
 
 #: src/tool/optionsprocessor.cpp:486
 msgid "Output file sequence separator set to: '"
@@ -5134,7 +5282,7 @@ msgstr ""
 #: src/tool/optionsprocessor.cpp:538
 #, c-format
 msgid "Unable to load file '%s'."
-msgstr ""
+msgstr "Nie można załadować pliku '%s'"
 
 #: src/tool/optionsprocessor.cpp:546
 msgid "No input file provided."
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index 10d0105..7fc2ec0 100644
Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8623eaf..06cb27e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -17,10 +17,10 @@
 # rodolforg <rodolforg at gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "synfig/language/pt_BR/)\n"
@@ -39,8 +39,9 @@ msgstr "Texto"
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "Outro"
 
@@ -66,8 +67,9 @@ msgstr "Texto a Renderizar"
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "Cor"
 
@@ -85,7 +87,7 @@ msgstr "Estilo"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr "Normal"
 
@@ -98,7 +100,7 @@ msgid "Italic"
 msgstr "Itálico"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr "Peso"
 
@@ -168,9 +170,12 @@ msgstr "Orientação do Texto"
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr "Origem"
 
@@ -204,7 +209,7 @@ msgstr "Desligue isto se você estiver animando o texto"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr "Inverter"
 
@@ -249,27 +254,27 @@ msgid "Type of blur to use"
 msgstr "Tipo de desfoque a usar"
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr "Desfoque de Caixa"
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr "Desfoque Gaussiano Rápido"
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr "Desfoque Hachurado"
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr "Desfoque Gaussiano"
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr "Desfoque em Disco"
 
@@ -356,6 +361,7 @@ msgstr "Curva de Dobra"
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr "Distorções"
 
@@ -366,13 +372,14 @@ msgstr "Posição da linha Spline de destino"
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr "Largura"
 
@@ -430,7 +437,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr "Nome do arquivo parece já estar definido para \"%s\" (%s)"
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr "Nome de arquivo"
 
@@ -438,7 +445,8 @@ msgstr "Nome de arquivo"
 msgid "File to import"
 msgstr "Arquivo a importar"
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr "Deslocamento de Tempo"
 
@@ -605,7 +613,8 @@ msgstr "Deslocamento Exterior"
 msgid "Scale Outside"
 msgstr "Escala Exterior"
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr "Rotacionar"
 
@@ -622,12 +631,13 @@ msgstr "Aponte onde deseja que a origem seja"
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr "Quantidade"
 
@@ -649,7 +659,7 @@ msgid "Spherize"
 msgstr "Esferizar"
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr "Posição"
 
@@ -664,7 +674,7 @@ msgstr "Onde a distorção da esfera está centralizada"
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr "Raio"
 
@@ -768,12 +778,13 @@ msgstr "Ser Alfa Seguro"
 msgid "Avoid alpha artifacts when checked"
 msgstr "Evita artefatos alfa, quando marcada"
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr "Laço de Tempo"
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr "Vínculo de Tempo"
 
@@ -781,16 +792,19 @@ msgstr "Vínculo de Tempo"
 msgid "Start time of the loop for the cycled context"
 msgstr "Tempo de início do laço para o contexto ciclado"
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr "Tempo Local"
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr "O tempo quando o laço resultante começa"
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr "Duração"
 
@@ -814,7 +828,8 @@ msgstr "Simétrico"
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr "Quando marcado, os laços são espelhados, centralizados no Tempo Local"
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr "Mover"
 
@@ -923,11 +938,12 @@ msgstr "Centro do padrão"
 msgid "Size of the pattern"
 msgstr "Tamanho do padrão"
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr "Escala"
 
@@ -1018,13 +1034,14 @@ msgstr "Exemplo"
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr "Cor de preenchimento da camada"
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr "Ponto 1"
 
@@ -1036,6 +1053,7 @@ msgstr "Primeiro canto do retângulo"
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr "Ponto 2"
 
@@ -1075,9 +1093,9 @@ msgstr "Metaballs"
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr "Gradiente"
 
@@ -1145,7 +1163,7 @@ msgid "Blur"
 msgstr "Desfocar"
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr "Desfoques"
 
@@ -1173,7 +1191,8 @@ msgstr "Contraste"
 msgid "Exposure Adjust"
 msgstr "Ajuste de Exposição"
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr "Ajuste de Gama"
 
@@ -1273,7 +1292,8 @@ msgstr "Contorno Avançado"
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr "Geometria"
 
@@ -1321,37 +1341,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr "Parar Arredondado"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr "Parar Quadrado"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr "Parar em Pico"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr "Parar Achatado"
 
@@ -1387,14 +1407,15 @@ msgid "Smoothness"
 msgstr "Suavidade"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+#, fuzzy
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr "Determina a interpolação entre pontos de largura. (0) Linear (1) Suave"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr "Homogêneo"
 
@@ -1465,7 +1486,8 @@ msgstr "Círculo"
 msgid "Radius of the circle"
 msgstr "Raio do círculo"
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr "Esmaecer"
 
@@ -1488,8 +1510,9 @@ msgstr "Determina a função de diminuição para o esmaecimento"
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr "Linear"
 
@@ -1508,7 +1531,7 @@ msgstr "Sigmond"
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr "Cosseno"
 
@@ -1589,9 +1612,11 @@ msgstr "O raio dos pontos interiores na estrela"
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr "Ângulo"
 
@@ -1677,10 +1702,10 @@ msgstr "Largura global do gradiente"
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr "Laço"
 
@@ -1823,32 +1848,32 @@ msgstr "Altere para modificar a semente aleatória do ruído"
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr "Interpolação"
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr "Que tipo de interpolação usar"
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr "Vizinhos mais Próximos"
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr "Spline"
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr "Cúbico"
 
@@ -1906,13 +1931,20 @@ msgid "When checked the gradient is supersampled"
 msgstr "Quando marcada, o gradiente é super amostrado"
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr "Vínculo"
 
@@ -1934,6 +1966,7 @@ msgid "Seeds the random number generator"
 msgstr "Semeia o gerador de números aleatórios"
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr "Velocidade"
 
@@ -2027,8 +2060,9 @@ msgstr ""
 "Se ativado, o canal alfa do gradiente é multiplicado pelo tamanho da haste e "
 "um alfa de 1,0 é usado ao renderizar"
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr "Reverso"
 
@@ -2036,8 +2070,9 @@ msgstr "Reverso"
 msgid "If enabled, render the plant in the opposite direction"
 msgstr "Se ativado, renderiza a planta na direção oposta"
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr "Passo"
 
@@ -2252,7 +2287,7 @@ msgstr "Importer::open(): Não é possível encontrar a extensão"
 msgid "Importer::open(): Unknown file type -- "
 msgstr "Importer::open(): Tipo de arquivo desconhecido --"
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr "Não é possível criar destino da superfície"
 
@@ -2264,255 +2299,298 @@ msgstr "Profundidade Z"
 msgid "Modifies the position of the layer in the layer stack"
 msgstr "Modifica a posição da camada na pilha de camadas"
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr "Superior Esquerdo"
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr "Canto Superior esquerdo da imagem"
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr "Inferior Direito"
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr "Canto Inferior direito da imagem"
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr "Canal alfa da camada"
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr "Método de Mistura"
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr "O método de mistura usado para composição nas camadas inferiores"
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr "Duplicar"
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr "Índice"
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr "Índice da Cópia"
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr "[MIME]"
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr "Desfoque de Movimento"
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr "Abertura"
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr "Tempo do Obturador"
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr "Fator de Subamostras"
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr "Multiplica o Número de Subamostras Renderizadas"
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr "Tipo de Subamostragem"
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr "Tipo de Curva para Ponderação de Subamostras"
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr "Constante"
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr "Hiperbólico"
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr "Quantidade Inicial da Subamostra"
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr "Quantidade Relativa da Primeira Subamostra, para Ponderação Linear"
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr "Quantidade Final da Subamostra"
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr "Quantidade Relativa da Última Subamostra, para Ponderação Linear"
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr "Deslocamento de posição"
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr "Transformação"
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr "Posição, rotação, inclinação e escala"
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr "Tela"
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr "Conteúdo do grupo"
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr "Deslocamento de Tempo para aplicar ao contexto"
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 "Quando marcada, evita selecionar as filhas utilizando o clique do mouse"
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr "Aumentar Contorno"
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 "Valor exponencial para aumentar a largura das camadas de Contorno filhas"
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr "Tempo Atual"
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr "Polígono"
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr "Lista de Vértices"
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr "Define os cantos do polígono"
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr "Forma"
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr "Interno"
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr "Cor da Camada de_Forma"
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr "Antisserrilha"
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr "Tipo de Esmaecimento"
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr "Tipo de esmaecimento a utilizar"
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr "Estilo Sinuoso"
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr "Estilo sinuoso a utilizar"
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr "Não Zero"
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr "Par/Ímpar"
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr "Esqueleto"
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr "Nome"
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr "Ossos"
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+#, fuzzy
+msgid "Skeleton Deformation"
+msgstr "transformação"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+#, fuzzy
+msgid "First corner of the bounds rectangle"
+msgstr "Primeiro canto do retângulo"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+#, fuzzy
+msgid "Second corner of the bounds rectangle"
+msgstr "Segundo canto do retângulo"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+#, fuzzy
+msgid "Horizontal subdivisions"
+msgstr "Espaçamento Horizontal"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr "Cor Sólida"
 
-#: src/synfig/layer_sound.cpp:51
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
-msgstr "Arredondado"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
-msgstr "Não é possível abrir o arquivo"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr "Alternar"
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr "Nome da Camada Ativa"
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr "Apenas a camada com nome especificado é visível"
 
@@ -2819,7 +2897,7 @@ msgstr "entidade \"autor\" em branco"
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr "Tela '%s' tem %s indefinido: %s"
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr "Nó de Valor"
 
@@ -3021,8 +3099,8 @@ msgstr "%s não parece ser um arquivo de paleta %s válido"
 msgid "%s does not appear to be a supported palette file"
 msgstr "%s não parece ser um arquivo de paleta suportado"
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr "Composição"
 
@@ -3062,13 +3140,13 @@ msgstr "Multiplicar"
 msgid "Divide"
 msgstr "Dividir"
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr "Subtrair"
 
@@ -3084,12 +3162,14 @@ msgstr "Clarear"
 msgid "Darken"
 msgstr "Escurecer"
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr "Matiz"
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr "Saturação"
 
@@ -3209,230 +3289,260 @@ msgstr ""
 "Time(): Nenhuma unidade fornecida no código de tempo e a taxa de quadros é "
 "desconhecida! Adotando SEGUNDOS"
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr "Composição Radial"
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr "Referência"
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr "Tangente de Segmento"
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr "Vértice de Segmento"
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr "Listras"
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr "Dois Tons"
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr "Lista Dinâmica"
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr "Rotação de Gradiente"
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr "Seno"
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr "Troca Cronometrada"
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr "Repetir Gradiente"
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr "Exponencial"
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr "Tangente da Spline"
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr "Vértice da Spline"
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr "Alcance"
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr "Cosseno"
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr "aTan2"
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr "Tangente Reverso"
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr "Recíproco"
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr "Inteiro"
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr "Largura da Spline"
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr "Ângulo do Vetor"
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr "Comprimento do Vetor"
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr "Vetor X"
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr "Vetor Y"
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr "Cor do Gradiente"
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr "Produto Escalar"
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr "Sequência de Tempo"
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr "Real"
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr "Sequência Real"
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr "Lista Adicionada"
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr "Sequência de Ângulo"
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr "Sequência de Inteiro"
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr "Logaritmo"
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr "Acinzentado"
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr "Potência"
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr "Comparar"
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr "Não"
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr "E"
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr "Ou"
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr "Influência do Osso"
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr "Osso"
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr "Osso Raiz"
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr "Lista Estática"
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr "Par de Peso do Osso"
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr "Vínculo de Osso"
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr "WPList"
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr "DIList"
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr "Média"
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr "Média Ponderada"
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr "Dinâmico"
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr "Derivativo"
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr "Tipo inválido: Nó de Valor '%s' não aceita o tipo '%s'"
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr "Marcador de posição"
 
@@ -3441,1274 +3551,1310 @@ msgstr "Marcador de posição"
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr "%s:%d tipo errado para %s: precisa de %s mas obteve %s"
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ":Tipo inválido"
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr "Um ou ambos de meus parâmetros não estão definidos!"
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr "LEA"
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr "Lado Esquerdo da adição"
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr "LDA"
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr "Lado Direito da adição"
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr "Escalar"
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr "Valor que multiplica a adição"
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr "E"
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr "Vínculo1"
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr "Primeiro operador da operação E"
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr "Vínculo2"
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr "Segundo operador da operação E"
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr "Valor a converter para sequência"
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr "Largura da sequência"
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr "Precisão"
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr "Número de casas decimais"
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr "Preenchido de Zero"
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 "Quando marcada, a sequência é preenchida à esquerda com zeros para coincidir "
 "com a largura"
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr "Um ponto de passagem já existe neste ponto no tempo"
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr "%s: Você não pode usar um %s em um Nó de Valor animado"
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr "Animado"
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr "X"
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr "Cosseno do ângulo"
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr "Y"
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr "Seno do ângulo"
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr "Nenhuma entrada na lista"
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr "Nenhuma entrada em ret_list"
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr "Vértice %03d"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr "A Spline a qual a tangente é vinculada"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr "Quando marcada, o valor entra em laço contínuo."
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr "A posição da tangente vinculada na Spline (0,1]"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr "Deslocamento"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr "Deslocamento do ângulo da tangente"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr "Escala da tangente"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr "Comprimento fixo"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr "Quando marcada, o comprimento da tangente é fixo."
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr "Quando marcada, a tangente é baseada no comprimento da Spline"
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr "A spline a qual o vértice é vinculado"
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr "A posição do vértice vinculado na Spline (0,1]"
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr "Quando marcada, a posição é baseada no comprimento da Spline"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr "A spline a qual a largura é vinculada"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr "A posição da largura vinculada na spline (0,1]"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr "Escala da largura"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr "Quando marcada, a largura é baseada no comprimento da spline"
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr "A tangente referenciada para reverter"
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr "Quando marcada, a referência é revertida"
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr "Osso %d"
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr "O nome do osso"
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr "Pai"
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr "O osso pai do osso"
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr "A origem de rotação do osso em relação ao seu pai"
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr "O ângulo de rotação do osso em relação ao seu pai"
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr "Escala de Comprimento Local"
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr "A escala do osso alinhada a seu comprimento"
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr "Largura do Osso"
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr "Largura do osso na sua origem"
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr "Escala de Comprimento Recursiva"
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr "A escala do osso e de seus filhos alinhada a seu comprimento"
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr "Largura da Ponta"
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr "Largura do osso na sua ponta"
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr "Profundidade-Z"
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr "A profundidade-z do osso"
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr "Definição de Comprimento"
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr "O comprimento do osso na definição"
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr "Raiz"
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr "Lista de Largura do Osso"
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr "Lista de ossos usada para calcular a influência"
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr "O nó de valor sendo influenciado pelo osso"
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr "O osso vinculado"
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr "Valor base"
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr "Fazer tradução"
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr "Fazer rotação"
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr "Enviesado"
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr "Fazer enviesado"
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr "Escala X"
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr "Fazer escala pelo eixo X"
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr "Escala Y"
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr "Fazer escala pelo eixo Y"
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr "Osso usado para fazer influência"
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr "largura"
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr "O valor relativo de influência do osso"
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr "O lado esquerdo da comparação"
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr "O lado direito da comparação"
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr "Maior"
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr "Quando marcada, retorna verdadeiro se LEA > LDA"
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr "Igual"
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr "Quando marcada, retorna verdadeiro se LEA = LDA"
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr "Menos"
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr "Quando marcada, retorna verdadeiro se LEA < LDA"
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr "Tipo inválido de composição"
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr "Vermelho"
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr "O componente vermelho da cor"
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr "Verde"
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr "O componente verde da cor"
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr "Azul"
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr "O componente azul da cor"
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr "Alfa"
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr "O alfa da cor"
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr "Vértice 1"
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr "O primeiro vértice do segmento"
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr "Tangente 1"
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr "A primeira tangente do segmento"
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr "Vértice 2"
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr "O segundo vértice do segmento"
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr "Tangente 2"
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr "A segunda tangente do segmento"
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr "Eixo-X"
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr "O componente Eixo-X do vetor"
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr "Eixo-Y"
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr "O componente Eixo-Y do vetor"
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr "Vértice"
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr "O vértice do Ponto Spline"
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr "A largura do Ponto Spline"
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr "Define a posição Desligado e Ligado relativa aos vizinhos"
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr "Dividir"
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr "Quando marcada, as tangentes são independentes"
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr "A primeira tangente do Ponto Spline"
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr "A segunda tangente do Ponto Spline"
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr "Divisão do Raio"
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr "Quando marcada, os raios da tangente são independentes"
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr "Divisão do Ângulo"
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr "Quando marcada, os ângulos da tangente são independentes"
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr "A posição [0,1] do Ponto de Largura sobre a Spline"
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr "A largura de um Ponto de Largura"
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr "Tipo Lateral Anterior"
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr "Define o tipo de interpolação do ponto de largura"
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr "Interpolar"
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr "Tipo Lateral Posterior"
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr "Limite Inferior"
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr "Define a posição no início da Spline"
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr "Limite Superior"
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr "Define a posição no fim da Spline"
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr "O comprimento de deslocamento do Item Traço sobre a Spline"
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr "Extensão"
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr "O comprimento do Item Traço"
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr "Define o tipo de lado do item traço"
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr "O componente Deslocamento da transformação"
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr "O componente Ângulo da transformação"
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr "Ângulo da Inclinação"
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr "O componente Ângulo da Inclinação da transformação"
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr "O componente Escalar da transformação"
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr "A Largura do valor"
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr "Valor"
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr "O Valor"
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr "Primeiro"
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr "O Primeiro Valor"
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr "Segundo"
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr "O Segundo Valor"
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr "Valor para calcular o cosseno"
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr "Amplitude"
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr "Multiplicador do cosseno resultante"
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr "Valor para calcular o derivativo"
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr "Intervalo"
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr "Intervalo de tempo para calcular as diferenças finitas"
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr "Precisão"
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr "Precisão do derivativo"
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr "Áspero"
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr "Fino"
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr "Extremo"
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr "Ordem"
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr "Ordem do derivativo"
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr "Primeiro Derivativo"
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr "Segundo Derivativo"
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr "Item de Traço %03d"
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr "O lado esquerdo do produto do ponto"
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr "O lado direito do produto do ponto"
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr "De"
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr "Valor inicial do índice"
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr "Para"
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr "Valor final do índice"
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr "Incremento de quantidade do índice"
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr "Ponta estática"
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr "Posição da ponta de equilíbrio sem forças externas"
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr "Embasamento do sistema dinâmico"
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr "Força"
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr "Força externa aplicada no centro da massa de gravidade"
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr "Torque"
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr "Impulso externo aplicado ao centro da inércia"
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr "Coeficiente de amortecimento"
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr "Coeficiente de amortecimento radial do sistema dinâmico"
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr "Coeficiente de fricção"
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr "Coeficiente de fricção rotacional do sistema dinâmico"
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr "Coeficiente de elasticidade"
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr "Coeficiente de elasticidade radial do sistema dinâmico"
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr "Coeficiente de torção"
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr "Coeficiente de torção do sistema dinâmico"
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr "Massa"
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr "Massa do sistema dinâmico"
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr "Momento de Inércia"
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr "Momento de inércia do sistema dinâmico"
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr "Mola rígida"
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr "Quando marcada, a mola linear é rígida"
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr "Torção rígida"
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr "Quando marcada, a mola de torção é rígida"
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr "Origem arrasta a ponta"
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 "Quando marcada, o resultado é origem + ponta, do contrário é apenas a ponta"
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr "Incompatibilidade de tipo de lista/item, removendo a incompatibilidade"
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr "Item %03d"
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr "Expoente"
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr "O valor para elevar a constante 'e'"
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr "Multiplicador do expoente resultante"
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr "O gradiente de onde a cor é selecionada"
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr "A posição da cor no gradiente (0,1]"
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr "Quando marcada, o índice entraria em laço"
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr "O gradiente-fonte para rotacionar"
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr "O valor para deslocar o gradiente"
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr "O valor em cinza"
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr "O valor inteiro a ser convertido"
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr "Int"
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr "Sequências"
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr "A Lista de sequências para juntar"
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr "Antes"
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr "A sequência para colocar antes das sequências ajuntadas"
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr "Separador"
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr "A sequência para colocar entre cada sequência ajuntada"
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr "Depois"
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr "A sequência para colocar após as sequências ajuntadas"
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr "Taxa"
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr "Valor que é multiplicado pelo tempo atual (em segundos)"
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr "Inclinação"
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr "Valor retornado quando o tempo atual é zero"
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr "Nó de valor usado para calcular o logaritmo neperiano"
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr "Ípsilon"
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr "Valor usado para comparar 'vínculo' com zero"
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr "Infinito"
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr "Valor retornado quando o resultado tende ao infinito"
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr "NÃO"
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr "Nó de valor usado para fazer a operação NÃO"
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr "OU"
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr "Nó de valor usado para a operação booleana OU"
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr "Base"
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr "A base a ser elevada à potência"
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr "A potência usada para elevar a base"
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr "Valor usado para comparar a base ou potência com zero"
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr "Tipo inválido para composição radial"
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr "Luminância"
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr "O comprimento do vetor"
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr "Teta"
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr "O ângulo do vetor com o eixo X"
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr "Alguns dos meus parâmetros não estão definidos!"
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr "Min"
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr "Valor retornado quando 'Vínculo' é menor"
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr "Max"
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr "Valor retornado quando 'Vínculo' é maior"
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr "O nó de valor para limitar sua variação"
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr "O valor real a ser convertido"
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr "O nó de valor usado para calcular sua recíproca"
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 "O valor usado para decidir se 'Vínculo' é pequeno demais para obter sua "
 "recíproca"
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr "O valor resultante quando 'Vínculo' < 'Ípsilon'"
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr "O valor referenciado"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr "O gradiente-fonte para repetir"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr "Contar"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr "O número de repetições do gradiente"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr "Especifica quão tendencioso é o gradiente-fonte na repetição [0,1]"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr "Especificar Início"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 "Quando marcada, 'Cor Inicial' é usada como o início do gradiente resultante"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr "Especificar Fim"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 "Quando marcada, 'Cor Final' é usada como o começo do gradiente resultante"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr "Cor Inicial"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr "Usada como o começo do gradiente resultante"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr "Cor Final"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr "Usada como o fim do gradiente resultante"
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+#, fuzzy
+msgid "The value to be reversed"
+msgstr "O valor real a ser convertido"
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr "Tentando obter o inverso de um Nó de Valor não inversível"
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr "O nó de valor usado para escalar"
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr "Valor que multiplica o nó de valor"
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr "Segmento"
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr "O Segmento ao qual a tangente é vinculada"
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr "A posição da tangente vinculada no Segmento (0,1]"
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr "O Segmento ao qual o vértice é vinculado"
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr "A posição do vértice vinculado no Segmento (0,1]"
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr "O ângulo a partir do qual o seno é calculado "
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr "O valor que multiplica o seno resultante"
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr "O nó de valor usado para fazer o passo"
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr "A duração do passo"
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr "Tempo Inicial"
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr "O tempo quando a conversão do passo começa"
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr "Interseção"
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr "Valor que define se o passo é centralizado no valor [0,1]"
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr "Cor 1"
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr "Uma cor das listras do gradiente"
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr "Cor 2"
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr "Outra cor das listras do gradiente"
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr "Contagem de Listras"
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr "Número de listras no gradiente"
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr "Largura das listras no gradiente entre [0,1]"
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr "Lado Esquerdo da subtração"
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr "Lado Direito da subtração"
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr "Valor que multiplica a subtração"
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr "Vínculo Desligado"
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr "O nó de valor retornado quando o interruptor está desligado"
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr "Vínculo Ligado"
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr "O nó de valor retornado quando o interruptor está ligado"
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 "Quando marcada, retorna 'Vínculo Ligado', do contrário retorna 'Vínculo "
 "Desligado'"
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 "O nó de valor retornado quando tempo atual é anterior a 'tempo' - "
 "'comprimento'"
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr "O nó de valor retornado quando o tempo atual está após 'tempo'"
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr "Tempo"
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr "O tempo quando a interpolação linear termina"
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
@@ -4716,57 +4862,58 @@ msgstr ""
 "A extensão de tempo quando a interpolação linear é feita entre 'Antes' e "
 "'Depois'"
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr "O nó de valor para o laço de tempo"
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr "Iniciar tempo do loop para a linha de tempo do nó de valor"
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr "Comprimento do loop"
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr "O tempo que é convertido para sequência"
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr "A cor inicial do gradiente"
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr "A cor final do gradiente"
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr "Vetor"
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr "O vetor a partir do qual o ângulo é calculado"
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr "O vetor a partir do qual o comprimento é calculado"
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr "O vetor a partir do qual a coordenada X é extraída"
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr "O vetor a partir do qual a coordenada Y é extraída"
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr "média ponderada"
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr "Ponto de Largura %03d"
diff --git a/po/ro.gmo b/po/ro.gmo
index 48273b3..b9534b2 100644
Binary files a/po/ro.gmo and b/po/ro.gmo differ
diff --git a/po/ro.po b/po/ro.po
index 7febc83..43e35e4 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,10 +6,10 @@
 # LiviuTM <liviu_micu at yahoo.com>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/synfig/language/"
 "ro/)\n"
@@ -29,8 +29,9 @@ msgstr "Text"
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "Altele"
 
@@ -56,8 +57,9 @@ msgstr "Nu se poate reda"
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "Culoare"
 
@@ -75,7 +77,7 @@ msgstr "Stil"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr "Normal"
 
@@ -88,7 +90,7 @@ msgid "Italic"
 msgstr "Italic"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr "Dimensiune"
 
@@ -158,9 +160,12 @@ msgstr "Orientarea textului"
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr "Origine"
 
@@ -194,7 +199,7 @@ msgstr "Dezactivaţi această opţiune dacă doriţi să animaţi textul"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr ""
 
@@ -239,27 +244,27 @@ msgid "Type of blur to use"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr ""
 
@@ -346,6 +351,7 @@ msgstr ""
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr "Distorsiuni"
 
@@ -356,13 +362,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr ""
 
@@ -420,7 +427,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr ""
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr "Numele fişierului"
 
@@ -428,7 +435,8 @@ msgstr "Numele fişierului"
 msgid "File to import"
 msgstr ""
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr ""
 
@@ -595,7 +603,8 @@ msgstr ""
 msgid "Scale Outside"
 msgstr ""
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr ""
 
@@ -612,12 +621,13 @@ msgstr ""
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr ""
 
@@ -639,7 +649,7 @@ msgid "Spherize"
 msgstr ""
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr "Poziţie"
 
@@ -654,7 +664,7 @@ msgstr "Centrul distorsiunii sferice"
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr "Raza cercului"
 
@@ -760,12 +770,13 @@ msgstr ""
 msgid "Avoid alpha artifacts when checked"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr "Buclă temporală"
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr ""
 
@@ -773,16 +784,19 @@ msgstr ""
 msgid "Start time of the loop for the cycled context"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr "Durată"
 
@@ -806,7 +820,8 @@ msgstr "Simetric"
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr "Tradu"
 
@@ -919,11 +934,12 @@ msgstr "Centrul tiparului"
 msgid "Size of the pattern"
 msgstr "Mărimea tiparului"
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr ""
 
@@ -1013,13 +1029,14 @@ msgstr "Exemplu"
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr ""
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr "Punctul 1"
 
@@ -1031,6 +1048,7 @@ msgstr "Primul colţ al dreptunghiului"
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr "Punctul 2"
 
@@ -1070,9 +1088,9 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr ""
 
@@ -1136,7 +1154,7 @@ msgid "Blur"
 msgstr ""
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr ""
 
@@ -1164,7 +1182,8 @@ msgstr ""
 msgid "Exposure Adjust"
 msgstr ""
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr ""
 
@@ -1264,7 +1283,8 @@ msgstr ""
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr ""
 
@@ -1310,37 +1330,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr ""
 
@@ -1374,14 +1394,14 @@ msgid "Smoothness"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr ""
 
@@ -1449,7 +1469,8 @@ msgstr ""
 msgid "Radius of the circle"
 msgstr ""
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr ""
 
@@ -1472,8 +1493,9 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr ""
 
@@ -1492,7 +1514,7 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr ""
 
@@ -1572,9 +1594,11 @@ msgstr ""
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr ""
 
@@ -1660,10 +1684,10 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr ""
 
@@ -1806,32 +1830,32 @@ msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr ""
 
@@ -1889,13 +1913,20 @@ msgid "When checked the gradient is supersampled"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr ""
 
@@ -1917,6 +1948,7 @@ msgid "Seeds the random number generator"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr ""
 
@@ -2001,8 +2033,9 @@ msgid ""
 "size, and an alpha of 1.0 is used when rendering"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr ""
 
@@ -2010,8 +2043,9 @@ msgstr ""
 msgid "If enabled, render the plant in the opposite direction"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr ""
 
@@ -2222,7 +2256,7 @@ msgstr ""
 msgid "Importer::open(): Unknown file type -- "
 msgstr ""
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr ""
 
@@ -2234,251 +2268,295 @@ msgstr ""
 msgid "Modifies the position of the layer in the layer stack"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr ""
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+#, fuzzy
+msgid "First corner of the bounds rectangle"
+msgstr "Primul colţ al dreptunghiului"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+#, fuzzy
+msgid "Second corner of the bounds rectangle"
+msgstr "Al doilea colţ al dreptunghiului"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+#, fuzzy
+msgid "Horizontal subdivisions"
+msgstr "Distanţă orizontală"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:51
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2774,7 +2852,7 @@ msgstr ""
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr ""
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr ""
 
@@ -2976,8 +3054,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr ""
 
@@ -3017,13 +3095,13 @@ msgstr ""
 msgid "Divide"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr ""
 
@@ -3039,12 +3117,14 @@ msgstr ""
 msgid "Darken"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr ""
 
@@ -3158,230 +3238,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr ""
 
@@ -3390,1319 +3500,1355 @@ msgstr ""
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+msgid "The value to be reversed"
+msgstr ""
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/ru.gmo b/po/ru.gmo
index 3befcb4..4f79c77 100644
Binary files a/po/ru.gmo and b/po/ru.gmo differ
diff --git a/po/ru.po b/po/ru.po
index bcb2a5f..c3ecfd0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,6 +3,8 @@
 # This file is distributed under the same license as the Synfig Core package.
 #
 # Translators:
+# Alexandre Prokoudine <alexandre.prokoudine at gmail.com>, 2010
+# AlexL <loginov.alex.valer at gmail.com>, 2015
 # Artem Krosheninnikov <feeblehamster at gmail.com>, 2011
 # genete <genetita at gmail.com>, 2011
 # morevnaproject <ksee.zelgadis at gmail.com>, 2011, 2012
@@ -15,19 +17,20 @@
 # Alexandre Prokoudine <alexandre.prokoudine at gmail.com>, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-13 05:35+0000\n"
-"Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-28 07:18+0000\n"
+"Last-Translator: AlexL <loginov.alex.valer at gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/synfig/language/"
 "ru/)\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
+"%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:66
 #: src/modules/lyr_freetype/lyr_freetype.cpp:569
@@ -38,8 +41,9 @@ msgstr "Текст"
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "Прочие"
 
@@ -65,8 +69,9 @@ msgstr "Отрисовываемый текст"
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "Цвет"
 
@@ -84,7 +89,7 @@ msgstr "Начертание"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr "Обычное"
 
@@ -97,7 +102,7 @@ msgid "Italic"
 msgstr "Курсивное"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr "Насыщенность"
 
@@ -167,9 +172,12 @@ msgstr "Ориентация текста"
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr "Исходная точка"
 
@@ -204,7 +212,7 @@ msgstr "Включите эту опцию, если вы собираетесь
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr "Инвертировать"
 
@@ -249,27 +257,27 @@ msgid "Type of blur to use"
 msgstr "Тип используемого размывания"
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr "Квадратичное размытие"
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr "Быстрое гауссово размытие"
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr "Перекрестное размытие"
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr "Гауссово размытие"
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr "Дисковое размытие"
 
@@ -356,23 +364,25 @@ msgstr "Деформация по кривой"
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr "Искажение"
 
 #: src/modules/lyr_std/curvewarp.cpp:399
 msgid "Position of the destiny Spline line"
-msgstr ""
+msgstr "Положение судьбоносной кривой линии"
 
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr "Ширина"
 
@@ -407,7 +417,7 @@ msgstr "Вершины"
 
 #: src/modules/lyr_std/curvewarp.cpp:419
 msgid "List of Spline Points where the source line is curved to"
-msgstr ""
+msgstr "Список точек Кривой, куда изогнута линия источника"
 
 #: src/modules/lyr_std/curvewarp.cpp:422
 #: src/modules/mod_geometry/advanced_outline.cpp:1189
@@ -418,7 +428,7 @@ msgstr "Быстрая отрисовка"
 #: src/modules/lyr_std/curvewarp.cpp:423
 #: src/modules/mod_gradient/curvegradient.cpp:581
 msgid "When checked, renders quickly but with artifacts"
-msgstr "При включении отрисовывает быстро, но с артефактами"
+msgstr "Когда включено, отрисовывает быстро, но с артефактами"
 
 #: src/modules/lyr_std/import.cpp:60
 msgid "Import Image"
@@ -430,7 +440,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr "Имя файла уже указано - \"%s\" (%s)"
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr "Имя файла"
 
@@ -438,7 +448,8 @@ msgstr "Имя файла"
 msgid "File to import"
 msgstr "Импортируемый файл"
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr "Смещение во времени"
 
@@ -452,7 +463,7 @@ msgstr "Наизнанку"
 
 #: src/modules/lyr_std/insideout.cpp:163
 msgid "Defines where the center will be"
-msgstr ""
+msgstr "Определяет, где должен быть центр"
 
 #: src/modules/lyr_std/julia.cpp:56
 msgid "Julia Set"
@@ -484,11 +495,11 @@ msgstr "Смещение цвета"
 
 #: src/modules/lyr_std/julia.cpp:346 src/modules/lyr_std/mandelbrot.cpp:219
 msgid "Iterations"
-msgstr "Итераций"
+msgstr "Повторений"
 
 #: src/modules/lyr_std/julia.cpp:349
 msgid "Seed Point"
-msgstr "Точка зерна"
+msgstr "Точка начального значения"
 
 #: src/modules/lyr_std/julia.cpp:352 src/modules/lyr_std/mandelbrot.cpp:222
 msgid "Bailout ValueBase"
@@ -605,7 +616,8 @@ msgstr "Смещение снаружи"
 msgid "Scale Outside"
 msgstr "Масштаб снаружи"
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr "Вращение"
 
@@ -622,12 +634,13 @@ msgstr "Укажите, где вы хотите разместить точку
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr "Величина"
 
@@ -649,7 +662,7 @@ msgid "Spherize"
 msgstr "Сферизация"
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr "Положение"
 
@@ -664,13 +677,13 @@ msgstr "Где находится центр сферического искаж
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr "Радиус"
 
 #: src/modules/lyr_std/sphere_distort.cpp:149
 msgid "The size of the sphere distortion"
-msgstr "Размер сверического искажения"
+msgstr "Размер сферического искажения"
 
 #: src/modules/lyr_std/sphere_distort.cpp:155
 msgid "The distortion intensity (negative values inverts effect)"
@@ -738,7 +751,7 @@ msgstr "Сглаживание"
 
 #: src/modules/lyr_std/supersample.cpp:148
 msgid "Unable to create SurfaceTarget"
-msgstr "Не удается создать Поверхность цели"
+msgstr "Не удается создать целевую поверхность"
 
 #: src/modules/lyr_std/supersample.cpp:340
 msgid "Width of sample area (In pixels)"
@@ -766,14 +779,15 @@ msgstr "Не затрагивать прозрачность"
 
 #: src/modules/lyr_std/supersample.cpp:352
 msgid "Avoid alpha artifacts when checked"
-msgstr "При включении позволяет избежать помех от прозрачности"
+msgstr "Когда включено, позволяет избежать помех от прозрачности"
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr "Петля времени"
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr "Время связывания"
 
@@ -781,16 +795,19 @@ msgstr "Время связывания"
 msgid "Start time of the loop for the cycled context"
 msgstr "Время начала цикла для замкнутого контекста"
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr "Локальное время"
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr "Время, когда начинается результирующий цикл"
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr "Длительность"
 
@@ -804,7 +821,7 @@ msgstr "Только для положительной длительности"
 
 #: src/modules/lyr_std/timeloop.cpp:152
 msgid "When checked will loop only positive durations"
-msgstr "При включении замыкаются только положительные последовательности"
+msgstr "Когда включено, замыкаются только положительные последовательности"
 
 #: src/modules/lyr_std/timeloop.cpp:157
 msgid "Symmetrical"
@@ -812,9 +829,10 @@ msgstr "Симметрично"
 
 #: src/modules/lyr_std/timeloop.cpp:158
 msgid "When checked, loops are mirrored centered at Local Time"
-msgstr "При включении, циклы отражаются с центром в точке Местное Время"
+msgstr "Когда включено, циклы отражаются с центром в точке Местное Время"
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr "Перемещение"
 
@@ -845,11 +863,11 @@ msgstr "Число оборотов эффекта вращения"
 
 #: src/modules/lyr_std/twirl.cpp:131
 msgid "When checked, distorts inside the circle"
-msgstr "Привключении искажает внутрь окружности"
+msgstr "Когда включено, искажает внутрь окружности"
 
 #: src/modules/lyr_std/twirl.cpp:136
 msgid "When checked, distorts outside the circle"
-msgstr "При включении искажать внутрь окружности"
+msgstr "Когда включено, искажает извне окружности"
 
 #: src/modules/lyr_std/warp.cpp:57
 msgid "Warp"
@@ -923,21 +941,22 @@ msgstr "Центр шаблона"
 msgid "Size of the pattern"
 msgstr "Размер шаблона"
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr "Масштаб"
 
 #: src/modules/lyr_std/zoom.cpp:100
 msgid "Amount to scale to"
-msgstr ""
+msgstr "Величина приближения"
 
 #: src/modules/lyr_std/zoom.cpp:107
 msgid "Point to scale from"
-msgstr ""
+msgstr "Точка, из которой приблизить"
 
 #: src/modules/mod_bmp/mptr_bmp.cpp:132 src/modules/mod_bmp/mptr_bmp.cpp:133
 #: src/modules/mod_ppm/mptr_ppm.cpp:70
@@ -953,22 +972,22 @@ msgstr "Файл %s сохранён не в формате BMP"
 #: src/modules/mod_bmp/mptr_bmp.cpp:151
 #, c-format
 msgid "Failure while reading BITMAP::FILEHEADER from %s"
-msgstr ""
+msgstr "Ошибка при чтении %s из BITMAP::FILEHEADER"
 
 #: src/modules/mod_bmp/mptr_bmp.cpp:159
 #, c-format
 msgid "Failure while reading BITMAP::INFOHEADER from %s"
-msgstr ""
+msgstr "Ошибка при чтении  BITMAP::INFOHEADER из %s"
 
 #: src/modules/mod_bmp/mptr_bmp.cpp:169
 #, c-format
 msgid "Bad BITMAP::FILEHEADER in %s. (bfOffsetBits=%d, should be %d)"
-msgstr ""
+msgstr "Плохой BITMAP::FILEHEADER в %s. (bfOffsetBits=%d, должно быть %d)"
 
 #: src/modules/mod_bmp/mptr_bmp.cpp:177
 #, c-format
 msgid "Bad BITMAP::INFOHEADER in %s. (biSize=%d, should be %d)"
-msgstr ""
+msgstr "Плохой BITMAP::INFOHEADER в %s. (biSize=%d, должно быть %d)"
 
 #: src/modules/mod_bmp/mptr_bmp.cpp:195 src/modules/mod_bmp/mptr_bmp.cpp:196
 msgid "Reading compressed bitmaps is not supported"
@@ -977,11 +996,11 @@ msgstr "Чтение сжатых изображений не поддержив
 #: src/modules/mod_bmp/mptr_bmp.cpp:202 src/modules/mod_bmp/mptr_bmp.cpp:203
 #, c-format
 msgid "Unsupported bit depth (bit_count=%d, should be 24 or 32)"
-msgstr ""
+msgstr "Неподдерживаемая битовая глубина (bit_count=%d, должно быть 24 или 32)"
 
 #: src/modules/mod_bmp/trgt_bmp.cpp:187
 msgid " (animated)"
-msgstr ""
+msgstr "(анимировано)"
 
 #: src/modules/mod_bmp/trgt_bmp.cpp:197 src/modules/mod_bmp/trgt_bmp.cpp:198
 msgid "Unable to open file"
@@ -1001,7 +1020,7 @@ msgstr "Не удалось записать информационный заг
 #: src/modules/mod_dv/trgt_dv.cpp:207 src/modules/mod_dv/trgt_dv.cpp:216
 #: src/modules/mod_dv/trgt_dv.cpp:225
 msgid "Unable to open pipe to encodedv"
-msgstr ""
+msgstr "Не удаётся открыть канал encodedv"
 
 #: src/modules/mod_example/filledrect.cpp:59
 msgid "Filled Rectangle"
@@ -1017,24 +1036,26 @@ msgstr "Примеры"
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr "Цвет заливки слоя"
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr "Точка 1"
 
 #: src/modules/mod_example/filledrect.cpp:137
 #: src/modules/mod_geometry/rectangle.cpp:145
 msgid "First corner of the rectangle"
-msgstr "Первый угла прямоугольника"
+msgstr "Первый угол прямоугольника"
 
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr "Точка 2"
 
@@ -1074,9 +1095,9 @@ msgstr "Metaballs"
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr "Градиент"
 
@@ -1114,33 +1135,36 @@ msgid ""
 "\n"
 "Please install \"ffmpeg\" or \"avconv\" (libav-tools package)."
 msgstr ""
+"Ошибка: Не найдено бинарника FFmpeg.\n"
+"\n"
+"Пожалуйста, установите \"ffmpeg\" или \"avconv\" (пакет libav-tools)."
 
 #: src/modules/mod_ffmpeg/trgt_ffmpeg.cpp:279
 msgid "Unable to open pipe to ffmpeg (no pipe)"
-msgstr ""
+msgstr "Не удаётся открыть канал ffmpeg (нет канала)"
 
 #: src/modules/mod_ffmpeg/trgt_ffmpeg.cpp:286
 msgid "Unable to open pipe to ffmpeg (pid == -1)"
-msgstr ""
+msgstr "Не удаётся открыть канал ffmpeg (pid == -1)"
 
 #: src/modules/mod_ffmpeg/trgt_ffmpeg.cpp:296
 msgid "Unable to open pipe to ffmpeg (dup2( p[0], STDIN_FILENO ) == -1)"
-msgstr ""
+msgstr "Не удаётся открыть канал ffmpeg (dup2( p[0], STDIN_FILENO ) == -1)"
 
 #: src/modules/mod_ffmpeg/trgt_ffmpeg.cpp:318
 msgid "Unable to open pipe to ffmpeg (exec failed)"
-msgstr ""
+msgstr "Не удаётся открыть канал ffmpeg (ошибка exec)"
 
 #: src/modules/mod_ffmpeg/trgt_ffmpeg.cpp:336
 msgid "Unable to open pipe to ffmpeg (no file)"
-msgstr ""
+msgstr "Не удаётся открыть канал ffmpeg (нет файла)"
 
 #: src/modules/mod_filter/blur.cpp:69
 msgid "Blur"
 msgstr "Размывание"
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr "Размывание"
 
@@ -1168,7 +1192,8 @@ msgstr "Контраст"
 msgid "Exposure Adjust"
 msgstr "Коррекция экспозиции"
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr "Коррекция гаммы"
 
@@ -1201,7 +1226,7 @@ msgstr "Цвет тени"
 #: src/modules/mod_filter/halftone3.cpp:333
 #: src/modules/mod_gradient/conicalgradient.cpp:125
 msgid "Symmetric"
-msgstr ""
+msgstr "Симметрично"
 
 #: src/modules/mod_filter/halftone2.cpp:177
 #: src/modules/mod_filter/halftone3.cpp:334
@@ -1211,12 +1236,12 @@ msgstr "Светлое на тёмном"
 #: src/modules/mod_filter/halftone2.cpp:179
 #: src/modules/mod_filter/halftone3.cpp:336
 msgid "Diamond"
-msgstr ""
+msgstr "Ромб"
 
 #: src/modules/mod_filter/halftone2.cpp:180
 #: src/modules/mod_filter/halftone3.cpp:337
 msgid "Stripe"
-msgstr ""
+msgstr "Полоса"
 
 #: src/modules/mod_filter/halftone3.cpp:59
 msgid "Halftone 3"
@@ -1228,7 +1253,7 @@ msgstr "Тип"
 
 #: src/modules/mod_filter/halftone3.cpp:340
 msgid "Subtractive Flag"
-msgstr ""
+msgstr "Флаг вычитания"
 
 #: src/modules/mod_filter/halftone3.cpp:348
 msgid " Color"
@@ -1260,7 +1285,7 @@ msgstr "Спадание"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:67
 msgid "Advanced Outline"
-msgstr ""
+msgstr "Расширенный контур"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:68
 #: src/modules/mod_geometry/checkerboard.cpp:59
@@ -1268,13 +1293,14 @@ msgstr ""
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr "Геометрия"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:152
 msgid "No vertices in spline "
-msgstr ""
+msgstr "Нет вершин в кривой"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1136
 #: src/modules/mod_geometry/outline.cpp:826
@@ -1282,7 +1308,7 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:562
 #: src/modules/mod_particle/plant.cpp:425
 msgid "A list of spline points"
-msgstr ""
+msgstr "Список точек кривой"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1140
 #: src/modules/mod_geometry/outline.cpp:840
@@ -1292,7 +1318,7 @@ msgstr "Толщина контура"
 #: src/modules/mod_geometry/advanced_outline.cpp:1141
 #: src/modules/mod_geometry/outline.cpp:841
 msgid "Global width of the outline"
-msgstr ""
+msgstr "Глобальная ширина контура"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1145
 #: src/modules/mod_geometry/outline.cpp:846
@@ -1302,59 +1328,59 @@ msgstr "Расширение"
 #: src/modules/mod_geometry/advanced_outline.cpp:1146
 #: src/modules/mod_geometry/outline.cpp:847
 msgid "Value to add to the global width"
-msgstr ""
+msgstr "Значение для добавления в глобальную ширину"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1149
 msgid "Tip Type at Start"
-msgstr "Тип закругления в начале"
+msgstr "Тип кончика в начале"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1150
 msgid "Defines the Tip type of the first spline point when spline is unlooped"
-msgstr "Определяет тип закругления первой точки у не замкнутой кривой"
+msgstr "Определяет тип кончика первой точки у незамкнутой кривой"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
-msgstr ""
+msgstr "Закруглённая остановка"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
-msgstr ""
+msgstr "Квадратная остановка"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
-msgstr ""
+msgstr "Заострённая остановка"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
-msgstr ""
+msgstr "Плоская остановка"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1158
 msgid "Tip Type at End"
-msgstr "Тип закругления в конце"
+msgstr "Тип кончика в конце"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1159
 msgid "Defines the Tip type of the last spline point when spline is unlooped"
-msgstr "Определяет тип закругления последней точки у не замкнутой кривой"
+msgstr "Определяет тип кончика последней точки у незамкнутой кривой"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1167
 msgid "Cusps Type"
@@ -1367,7 +1393,7 @@ msgstr "Определяет тип пиков"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1170
 msgid "Sharp"
-msgstr ""
+msgstr "Резкий"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1171
 msgid "Rounded"
@@ -1378,21 +1404,22 @@ msgid "Smoothness"
 msgstr "Плавность"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+#, fuzzy
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 "Определяет плавность перехода между точкам толщины. (0) Линейная (1) Плавная"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr "Однородность"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1180
 msgid "When true, widthpoints positions are spline length based"
-msgstr ""
+msgstr "При истине позиции точек ширины основываются на длине кривой"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1183
 msgid "Width Point List"
@@ -1405,7 +1432,7 @@ msgstr "Список точек толщины определяющих толщ
 #: src/modules/mod_geometry/advanced_outline.cpp:1190
 msgid "When checked outline renders faster, but less accurate"
 msgstr ""
-"Когда активно отрисовка контура происходит быстрее, но не так аккуратно"
+"Когда включено, отрисовка контура происходит быстрее, но не так аккуратно"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1193
 msgid "Dashed Outline"
@@ -1413,7 +1440,7 @@ msgstr "Пунктирная линия"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1195
 msgid "When checked outline is dashed"
-msgstr "Когда активно контур отображается пунктирной линией"
+msgstr "Когда включено, контур отображается пунктирной линией"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1198
 msgid "Dash Item List"
@@ -1425,11 +1452,11 @@ msgstr "Список элементов определяющих вид пунк
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1204
 msgid "Dash Items Offset"
-msgstr ""
+msgstr "Список элементов пунктира"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1207
 msgid "Distance to Offset the Dash Items"
-msgstr ""
+msgstr "Расстояние до смещения списка элементов пунктира"
 
 #: src/modules/mod_geometry/checkerboard.cpp:58
 msgid "Checkerboard"
@@ -1441,7 +1468,7 @@ msgstr "Цвет шахматных клеток"
 
 #: src/modules/mod_geometry/checkerboard.cpp:151
 msgid "Center of the checkers"
-msgstr ""
+msgstr "Центр шахматных клеток"
 
 #: src/modules/mod_geometry/checkerboard.cpp:155
 msgid "Size of checkers"
@@ -1455,13 +1482,14 @@ msgstr "Окружность"
 msgid "Radius of the circle"
 msgstr "Радиус круга"
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr "Растушёвка"
 
 #: src/modules/mod_geometry/circle.cpp:158
 msgid "Amount of feather of the circle"
-msgstr ""
+msgstr "Количество выступов у окружности"
 
 #: src/modules/mod_geometry/circle.cpp:166
 msgid "Invert the circle"
@@ -1478,8 +1506,9 @@ msgstr "Определяет функцию затухания для расту
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr "Линейная"
 
@@ -1493,12 +1522,12 @@ msgstr "Квадратный корень"
 
 #: src/modules/mod_geometry/circle.cpp:176
 msgid "Sigmond"
-msgstr "Sigmond"
+msgstr "Сигмоидальное"
 
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr "Косинус"
 
@@ -1521,7 +1550,7 @@ msgstr "Закругленное начало"
 #: src/modules/mod_geometry/outline.cpp:857
 #: src/modules/mod_geometry/outline.cpp:862
 msgid "Round off the tip"
-msgstr ""
+msgstr "Закруглить кончик"
 
 #: src/modules/mod_geometry/outline.cpp:861
 msgid "Rounded End"
@@ -1533,11 +1562,11 @@ msgstr "Петлистость"
 
 #: src/modules/mod_geometry/outline.cpp:866
 msgid "(Currently not used)"
-msgstr ""
+msgstr "(на данный момент не используется)"
 
 #: src/modules/mod_geometry/outline.cpp:870
 msgid "When checked the width takes the length of the spline to interpolate"
-msgstr ""
+msgstr "Когда включено, ширина займёт длину кривой при интерполяции"
 
 #: src/modules/mod_geometry/rectangle.cpp:59
 msgid "Rectangle"
@@ -1578,9 +1607,11 @@ msgstr "Радиус внутренних точек звезды"
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr "Угол"
 
@@ -1633,22 +1664,22 @@ msgstr "Градиенты"
 #: src/modules/mod_gradient/spiralgradient.cpp:114
 #: src/modules/mod_noise/noise.cpp:269
 msgid "Gradient to apply"
-msgstr ""
+msgstr "Градиент для принятия"
 
 #: src/modules/mod_gradient/conicalgradient.cpp:115
 msgid "Center of the cone"
-msgstr ""
+msgstr "Центр конуса"
 
 #: src/modules/mod_gradient/conicalgradient.cpp:121
 msgid "Rotation of the gradient around the center"
-msgstr ""
+msgstr "Вращение градиента вокруг центра"
 
 #: src/modules/mod_gradient/conicalgradient.cpp:126
 #: src/modules/mod_gradient/curvegradient.cpp:570
 #: src/modules/mod_gradient/lineargradient.cpp:204
 #: src/modules/mod_gradient/radialgradient.cpp:131
 msgid "When checked the gradient is looped"
-msgstr ""
+msgstr "Когда включено, градиент станет цикличным"
 
 #: src/modules/mod_gradient/curvegradient.cpp:61
 msgid "Curve Gradient"
@@ -1657,19 +1688,19 @@ msgstr "Искривленный градиент"
 #: src/modules/mod_gradient/curvegradient.cpp:551
 #: src/modules/mod_particle/plant.cpp:432
 msgid "Offset for the Vertices List"
-msgstr ""
+msgstr "Смещение для списка вершин"
 
 #: src/modules/mod_gradient/curvegradient.cpp:556
 msgid "Global width of the gradient"
-msgstr ""
+msgstr "Глобальная ширина градиента"
 
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr "Повтор"
 
@@ -1683,11 +1714,11 @@ msgstr "Зигзаг"
 #: src/modules/mod_gradient/lineargradient.cpp:208
 #: src/modules/mod_gradient/radialgradient.cpp:136
 msgid "When checked the gradient is symmetrical at the center"
-msgstr ""
+msgstr "Когда включено, градиент станет симметричным в центре"
 
 #: src/modules/mod_gradient/curvegradient.cpp:577
 msgid "Perpendicular"
-msgstr "Перпендикулярно"
+msgstr "Перпендикуляр"
 
 #: src/modules/mod_gradient/lineargradient.cpp:54
 msgid "Linear Gradient"
@@ -1695,11 +1726,11 @@ msgstr "Линейный градиент"
 
 #: src/modules/mod_gradient/lineargradient.cpp:192
 msgid "Start point of the gradient"
-msgstr ""
+msgstr "Начальная точка градиента"
 
 #: src/modules/mod_gradient/lineargradient.cpp:196
 msgid "End point of the gradient"
-msgstr ""
+msgstr "Конечная точка градиента"
 
 #: src/modules/mod_gradient/radialgradient.cpp:57
 msgid "Radial Gradient"
@@ -1724,7 +1755,7 @@ msgstr "По часовой стрелке"
 
 #: src/modules/mod_gradient/spiralgradient.cpp:137
 msgid "When checked the spiral turns clockwise"
-msgstr ""
+msgstr "Когда включено, спираль вращается по часовой стрелке"
 
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:105
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:106
@@ -1736,7 +1767,7 @@ msgstr "Нет загружаемого файла"
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:119
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:120
 msgid "Cannot create temporary file of "
-msgstr ""
+msgstr "Не удалось создать временный файл"
 
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:179
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:180
@@ -1755,17 +1786,17 @@ msgstr "Не удалось получить кадр из "
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:193
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:194
 msgid "Bad surface from "
-msgstr ""
+msgstr "Плохая поверхность из"
 
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:249
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:250
 msgid "Unable to open pipe to imagemagick"
-msgstr ""
+msgstr "Не удаётся открыть канал imagemagick"
 
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:261
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:262
 msgid "Reached end of stream without finding PPM header"
-msgstr ""
+msgstr "Достигнут конец потока без нахождения заголовка PPM"
 
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:270
 #: src/modules/mod_imagemagick/mptr_imagemagick.cpp:271
@@ -1784,7 +1815,7 @@ msgstr "Преждевременный конец файла"
 
 #: src/modules/mod_imagemagick/trgt_imagemagick.cpp:157
 msgid "Unable to open pipe to imagemagick's convert utility"
-msgstr ""
+msgstr "Не удаётся открыть канал утилиты конвертирования imagemagick"
 
 #: src/modules/mod_noise/distort.cpp:58
 msgid "Noise Distort"
@@ -1800,44 +1831,44 @@ msgstr "Величина искажения"
 
 #: src/modules/mod_noise/distort.cpp:228
 msgid "The distance between distortions"
-msgstr ""
+msgstr "Расстояние между искажениями"
 
 #: src/modules/mod_noise/distort.cpp:231 src/modules/mod_noise/noise.cpp:272
 msgid "RandomNoise Seed"
-msgstr "Зерно случайного шума"
+msgstr "Начальное значение случайного шума"
 
 #: src/modules/mod_noise/distort.cpp:232 src/modules/mod_noise/noise.cpp:273
 msgid "Change to modify the random seed of the noise"
-msgstr ""
+msgstr "Измените, чтобы модифицировать случайное начальное значение шума"
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr "Интерполяция"
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr "Какой тип интерполяции использовать"
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr "Ближайший сосед"
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
-msgstr "Сплайн"
+msgstr "Кривая"
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr "Кубическая"
 
@@ -1847,7 +1878,7 @@ msgstr "Детализация"
 
 #: src/modules/mod_noise/distort.cpp:246 src/modules/mod_noise/noise.cpp:291
 msgid "Increase to obtain fine details of the noise"
-msgstr ""
+msgstr "Увеличьте чтобы получить мельчайшие детали шума"
 
 #: src/modules/mod_noise/distort.cpp:249 src/modules/mod_noise/noise.cpp:294
 msgid "Animation Speed"
@@ -1855,7 +1886,7 @@ msgstr "Скорость анимации"
 
 #: src/modules/mod_noise/distort.cpp:250 src/modules/mod_noise/noise.cpp:295
 msgid "In cycles per second"
-msgstr ""
+msgstr "В циклах в секунду"
 
 #: src/modules/mod_noise/distort.cpp:253 src/modules/mod_noise/noise.cpp:298
 msgid "Turbulent"
@@ -1863,7 +1894,7 @@ msgstr "Турбулентность"
 
 #: src/modules/mod_noise/distort.cpp:254 src/modules/mod_noise/noise.cpp:299
 msgid "When checked produces turbulent noise"
-msgstr ""
+msgstr "Когда включено, создаётся турбулентный шум"
 
 #: src/modules/mod_noise/main.cpp:66
 #: src/modules/mod_noise/valuenode_random.cpp:169
@@ -1884,56 +1915,68 @@ msgstr "С альфа-каналом"
 
 #: src/modules/mod_noise/noise.cpp:303
 msgid "Uses transparency"
-msgstr ""
+msgstr "Использует прозрачность"
 
 #: src/modules/mod_noise/noise.cpp:306
 msgid "Super Sampling"
-msgstr ""
+msgstr "Супер сглаживание"
 
 #: src/modules/mod_noise/noise.cpp:307
 msgid "When checked the gradient is supersampled"
-msgstr ""
+msgstr "Когда включено, градиент станет супер сглаженным"
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr "Связь"
 
 #: src/modules/mod_noise/valuenode_random.cpp:251
 msgid "The value node source that provides the central value"
-msgstr ""
+msgstr "Исходное значение узла, который обеспечивает центральное значение"
 
 #: src/modules/mod_noise/valuenode_random.cpp:256
 msgid "The value of the maximum random difference"
-msgstr ""
+msgstr "Значение максимальной случайной разности"
 
 #: src/modules/mod_noise/valuenode_random.cpp:260
 #: src/modules/mod_particle/plant.cpp:483
 msgid "Seed"
-msgstr "Зерно"
+msgstr "Начальное значение"
 
 #: src/modules/mod_noise/valuenode_random.cpp:261
 msgid "Seeds the random number generator"
-msgstr ""
+msgstr "Начальные значения для генератора случайных чисел"
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr "Скорость"
 
 #: src/modules/mod_noise/valuenode_random.cpp:266
 msgid "Defines how often a new random value is chosen (in choices per second) "
 msgstr ""
+"Определяет, как часто выбирается новое случайное значение (в выборах в "
+"секунду)"
 
 #: src/modules/mod_noise/valuenode_random.cpp:271
 msgid ""
 "Determines how the value is interpolated from one random choice to the next"
 msgstr ""
+"Определяет, как значение интерполируется от одного случайного выбора к "
+"следующему"
 
 #: src/modules/mod_noise/valuenode_random.cpp:273
 msgid "No interpolation"
@@ -1941,11 +1984,11 @@ msgstr "Без интерполяции"
 
 #: src/modules/mod_noise/valuenode_random.cpp:282
 msgid "Loop Time"
-msgstr ""
+msgstr "Время цикла"
 
 #: src/modules/mod_noise/valuenode_random.cpp:283
 msgid "Makes the random value repeat after the given time"
-msgstr ""
+msgstr "Создаёт повторение случайного значения после заданного времени"
 
 #: src/modules/mod_particle/plant.cpp:70
 msgid "Plant"
@@ -1961,7 +2004,7 @@ msgstr "Угол разделения"
 
 #: src/modules/mod_particle/plant.cpp:442
 msgid "Angle by which each split deviates from its parent"
-msgstr ""
+msgstr "Угол, на который каждое расщепление отклоняется от его родителя"
 
 #: src/modules/mod_particle/plant.cpp:446
 msgid "Gravity"
@@ -1977,7 +2020,7 @@ msgstr "Скорость по касательной"
 
 #: src/modules/mod_particle/plant.cpp:453
 msgid "Amount to which shoots tend to grow along the tangent to the spline"
-msgstr ""
+msgstr "Число, до которого побеги растут по касательной к кривой"
 
 #: src/modules/mod_particle/plant.cpp:457
 msgid "Perpendicular Velocity"
@@ -1987,7 +2030,7 @@ msgstr "Скорость по перпендикуляру"
 msgid ""
 "Amount to which shoots tend to grow perpendicular to the tangent to the "
 "spline"
-msgstr ""
+msgstr "Число, до которого побеги растут перпендикулярно кривой"
 
 #: src/modules/mod_particle/plant.cpp:462
 msgid "Stem Size"
@@ -1995,7 +2038,7 @@ msgstr "Толщина"
 
 #: src/modules/mod_particle/plant.cpp:463
 msgid "Size of the stem"
-msgstr "Толщина стебеля"
+msgstr "Толщина стебля"
 
 #: src/modules/mod_particle/plant.cpp:468
 msgid "Size As Alpha"
@@ -2009,8 +2052,9 @@ msgstr ""
 "Если включено, альфа-канал градиента умножается на толщину побега, и при "
 "отрисовке используется альфа-канал 1.0"
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr "Развернуть"
 
@@ -2018,8 +2062,9 @@ msgstr "Развернуть"
 msgid "If enabled, render the plant in the opposite direction"
 msgstr "Если включено, то растение визуализируется в обратном направлении."
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr "Шаг"
 
@@ -2029,7 +2074,7 @@ msgstr "Единица измерения расстояния между точ
 
 #: src/modules/mod_particle/plant.cpp:484
 msgid "Used to seed the pseudo-random number generator"
-msgstr ""
+msgstr "Использовать начальное значение для псевдослучайного генератора чисел"
 
 #: src/modules/mod_particle/plant.cpp:488
 msgid "Splits"
@@ -2045,7 +2090,7 @@ msgstr "Побегов"
 
 #: src/modules/mod_particle/plant.cpp:494
 msgid "Number of places that growth occurs on each spline section"
-msgstr ""
+msgstr "Количество мест, где рост происходит на каждой секции кривой"
 
 #: src/modules/mod_particle/plant.cpp:498
 msgid "Random Factor"
@@ -2055,14 +2100,16 @@ msgstr "Фактор случайности"
 msgid ""
 "Used to scale down all random effects.  Set to zero to disable randomness"
 msgstr ""
+"Используется для масштабирования вниз всех случайных эффектов. Установите на "
+"ноль, чтобы отключить случайность"
 
 #: src/modules/mod_particle/plant.cpp:503
 msgid "Drag"
-msgstr ""
+msgstr "Перетаскивание"
 
 #: src/modules/mod_particle/plant.cpp:504
 msgid "Drag slows the growth"
-msgstr ""
+msgstr "Перетаскивание замедляет рост"
 
 #: src/modules/mod_particle/plant.cpp:508
 msgid "Use Width"
@@ -2070,11 +2117,11 @@ msgstr "Использовать ширину"
 
 #: src/modules/mod_particle/plant.cpp:509
 msgid "Scale the velocity by the spline's width"
-msgstr ""
+msgstr "Масштабировать скорость по ширине кривой"
 
 #: src/modules/mod_png/trgt_cairo_png.cpp:117 src/synfig/target_cairo.cpp:201
 msgid "Cairo Surface bad status"
-msgstr ""
+msgstr "Плохое состояние поверхности Cairo"
 
 #: src/modules/mod_png/trgt_png_spritesheet.cpp:176
 #, c-format
@@ -2082,6 +2129,8 @@ msgid ""
 "The image is too large. It's size must be not more than 5000*2000=10000000 "
 "px. Now is %d*%d=%d px."
 msgstr ""
+"Изображение слишком большое. Его размер должен быть не больше, чем "
+"5000*2000=10000000 пикс. Сейчас это %d*%d=%d пикс."
 
 #: src/modules/mod_ppm/mptr_ppm.cpp:78
 #, c-format
@@ -2090,15 +2139,15 @@ msgstr "%s был не в формате PPM"
 
 #: src/modules/mod_svg/layer_svg.cpp:53
 msgid "Import Svg"
-msgstr ""
+msgstr "Импортировать SVG"
 
 #: src/synfig/base_types.cpp:78 src/synfig/base_types.cpp:79
 msgid "bool"
-msgstr ""
+msgstr "логическое"
 
 #: src/synfig/base_types.cpp:99 src/synfig/base_types.cpp:100
 msgid "integer"
-msgstr ""
+msgstr "целое"
 
 #: src/synfig/base_types.cpp:122
 msgid "angle"
@@ -2106,7 +2155,7 @@ msgstr "угол"
 
 #: src/synfig/base_types.cpp:166 src/synfig/base_types.cpp:167
 msgid "real"
-msgstr "Real"
+msgstr "вещественный"
 
 #: src/synfig/base_types.cpp:194 src/synfig/base_types.cpp:195
 msgid "time"
@@ -2114,7 +2163,7 @@ msgstr "время"
 
 #: src/synfig/base_types.cpp:220
 msgid "vector"
-msgstr "Вектор"
+msgstr "вектор"
 
 #: src/synfig/base_types.cpp:239
 msgid "color"
@@ -2126,27 +2175,27 @@ msgstr "сегмент"
 
 #: src/synfig/base_types.cpp:278
 msgid "spline_point"
-msgstr ""
+msgstr "точка_кривой"
 
 #: src/synfig/base_types.cpp:297
 msgid "matrix"
-msgstr ""
+msgstr "матрица"
 
 #: src/synfig/base_types.cpp:316
 msgid "bone_weight_pair"
-msgstr ""
+msgstr "вес_пары_костей"
 
 #: src/synfig/base_types.cpp:336
 msgid "width_point"
-msgstr ""
+msgstr "ширина_точки"
 
 #: src/synfig/base_types.cpp:356
 msgid "dash_item"
-msgstr ""
+msgstr "пунктирный_элемент"
 
 #: src/synfig/base_types.cpp:375
 msgid "list"
-msgstr ""
+msgstr "список"
 
 #: src/synfig/base_types.cpp:434
 msgid "canvas"
@@ -2154,7 +2203,7 @@ msgstr "холст"
 
 #: src/synfig/base_types.cpp:465
 msgid "string"
-msgstr ""
+msgstr "строка"
 
 #: src/synfig/base_types.cpp:486
 msgid "gradient"
@@ -2162,27 +2211,27 @@ msgstr "градиент"
 
 #: src/synfig/base_types.cpp:505
 msgid "bone_object"
-msgstr ""
+msgstr "объект_кость"
 
 #: src/synfig/base_types.cpp:540
 msgid "bone_valuenode"
-msgstr ""
+msgstr "значение_узла_кости"
 
 #: src/synfig/base_types.cpp:563
 msgid "transformation"
-msgstr ""
+msgstr "преобразование"
 
 #: src/synfig/cairoimporter.cpp:88
 msgid "CairoImporter::open(): Cannot open empty filename"
-msgstr ""
+msgstr "CairoImporter::open(): Не удаётся открыть пустое имя файла"
 
 #: src/synfig/cairoimporter.cpp:102
 msgid "CairoImporter::open(): Couldn't find extension"
-msgstr ""
+msgstr "CairoImporter::open(): Не удалось найти расширение"
 
 #: src/synfig/cairoimporter.cpp:113
 msgid "CairoImporter::open(): Unknown file type -- "
-msgstr ""
+msgstr "CairoImporter::open(): Неизвестный тип файла -- "
 
 #: src/synfig/cairolistimporter.cpp:166 src/synfig/cairolistimporter.cpp:167
 #: src/synfig/listimporter.cpp:166 src/synfig/listimporter.cpp:167
@@ -2192,7 +2241,7 @@ msgstr "Нет изображений в списке"
 #: src/synfig/canvas.cpp:838 src/synfig/canvas.cpp:909
 #: src/synfig/canvas.cpp:934
 msgid "in line"
-msgstr ""
+msgstr "в строке"
 
 #: src/synfig/distance.cpp:258
 msgid "Units"
@@ -2200,7 +2249,7 @@ msgstr "Единицы измерения"
 
 #: src/synfig/distance.cpp:259
 msgid "Pixels"
-msgstr "Пикселы"
+msgstr "Пиксели"
 
 #: src/synfig/distance.cpp:261
 msgid "Inches"
@@ -2220,19 +2269,19 @@ msgstr "Сантиметры"
 
 #: src/synfig/importer.cpp:88
 msgid "Importer::open(): Cannot open empty filename"
-msgstr ""
+msgstr "Importer::open(): Не удаётся открыть пустое имя файла"
 
 #: src/synfig/importer.cpp:102
 msgid "Importer::open(): Couldn't find extension"
-msgstr ""
+msgstr "Importer::open(): Не удалось найти расширение"
 
 #: src/synfig/importer.cpp:113
 msgid "Importer::open(): Unknown file type -- "
-msgstr ""
+msgstr "Importer::open(): Неизвестный тип файла -- "
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
-msgstr ""
+msgstr "Не удается создать целевую поверхность"
 
 #: src/synfig/layer.cpp:791
 msgid "Z Depth"
@@ -2240,272 +2289,316 @@ msgstr "Глубина на оси Z"
 
 #: src/synfig/layer.cpp:793
 msgid "Modifies the position of the layer in the layer stack"
-msgstr ""
+msgstr "Изменяет позицию слоя в стеке слоёв"
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr "Левый верхний угол"
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr "Левый верхний угол изображения"
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr "Правый нижний угол"
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr "Правый нижний угол изображения"
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
-msgstr ""
+msgstr "Альфа канал слоя"
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr "Режим смешивания"
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
-msgstr ""
+msgstr "Метод смешивания использован для комбинирования на слои ниже"
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr "Дубликат"
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr "Индекс"
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
-msgstr ""
+msgstr "Копировать индекс"
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
-msgstr ""
+msgstr "[MIME]"
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr "Размывание движением"
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr "Апертура"
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr "Выдержка"
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
-msgstr ""
+msgstr "Коэффициент подвыборки"
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
-msgstr ""
+msgstr "Умножает количество визуализированных подвыборок"
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
-msgstr ""
+msgstr "Тип субдискретизации"
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
-msgstr ""
+msgstr "Тип изгиба для оценки весомости подвыборок"
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr "Константа"
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
-msgstr ""
+msgstr "Гиперболический"
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
-msgstr ""
+msgstr "Стартовая сумма подвыборки"
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
-msgstr ""
+msgstr "Относительная сумма первой подвыборки, для линейных - весомость"
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
-msgstr ""
+msgstr "Конечная сумма подвыборки"
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
-msgstr ""
+msgstr "Относительная сумма последней подвыборки, для линейных - весомость"
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
-msgstr ""
+msgstr "Положение смещения"
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
-msgstr ""
+msgstr "Преобразование"
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
-msgstr ""
+msgstr "Позиция, вращение, перекос и масштаб"
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr "Холст"
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
+msgstr "Группировать содержимое"
+
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
 msgstr ""
+"Множитель чтобы ускорить, замедлить, заморозить или обратить время вспять"
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
-msgstr ""
+msgstr "Смещение времени для применения к контексту"
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr "Заблокировать выделение"
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
-msgstr ""
+msgstr "Когда включено, предотвращается выбор детей щелчком мыши"
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
-msgstr ""
+msgstr "Рост контура"
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
-msgstr ""
+msgstr "Экспоненциальная значение для роста ширины слоёв контура детей"
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr "Текущее время"
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr "Многоугольник"
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
-msgstr ""
+msgstr "Список вершин"
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
-msgstr ""
+msgstr "Определяет углы многоугольника"
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr "Фигура"
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
-msgstr ""
+msgstr "Внутренний"
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
-msgstr ""
+msgstr "Цвет слоя Формы"
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr "Сглаживание"
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr "Тип растушевки"
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr "Используемый тип растушевки"
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr "Обработка взаимопересечений"
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr "Применяемая обработка взаимопересечений"
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr "Ненулевые"
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr "Чёт/Нечет"
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr "Скелет"
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
-msgstr "Name"
+msgstr "Имя"
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr "Кости"
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+#, fuzzy
+msgid "Skeleton Deformation"
+msgstr "преобразование"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+#, fuzzy
+msgid "First corner of the bounds rectangle"
+msgstr "Первый угол прямоугольника"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+#, fuzzy
+msgid "Second corner of the bounds rectangle"
+msgstr "Второй угол прямоугольника"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+#, fuzzy
+msgid "Horizontal subdivisions"
+msgstr "Межбуквенное расстояние"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr "Сплошная заливка"
 
-#: src/synfig/layer_sound.cpp:51
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
-msgstr "Скругленный"
+msgstr "Звук"
 
-#: src/synfig/layer_sound.cpp:102
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
-msgstr "Не удалось открыть файл"
+msgstr "Путь до звукового файла"
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
-msgstr ""
+msgstr "Задержка"
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
-msgstr ""
+msgstr "Задержка перед воспроизведением"
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
-msgstr ""
+msgstr "Громкость"
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
-msgstr ""
+msgstr "Громкость звука"
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr "Переключатель"
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr "Имя активного слоя"
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
-msgstr ""
+msgstr "Является видимым только слой со специальным именем"
 
 #: src/synfig/loadcanvas.cpp:148
 #, c-format
 msgid "cannot load '%s' recursively"
-msgstr ""
+msgstr "не удаётся загрузить '%s' рекурсивно"
 
 #: src/synfig/loadcanvas.cpp:192
 #, c-format
 msgid "Unexpected element <%s>, Expected <%s>"
-msgstr ""
+msgstr "Неожиданный элемент <%s>, ожидаемый <%s>"
 
 #: src/synfig/loadcanvas.cpp:198
 #, c-format
 msgid "Unexpected element <%s>"
-msgstr ""
+msgstr "Неожиданный элемент <%s>"
 
 #: src/synfig/loadcanvas.cpp:212
 msgid "Too many warnings"
@@ -2514,21 +2607,21 @@ msgstr "Слишком много предупреждений"
 #: src/synfig/loadcanvas.cpp:243
 #, c-format
 msgid "<%s> is missing \"%s\" attribute"
-msgstr ""
+msgstr "<%s> отсутствует \"%s\" атрибут"
 
 #: src/synfig/loadcanvas.cpp:273 src/synfig/loadcanvas.cpp:292
 #: src/synfig/loadcanvas.cpp:311 src/synfig/loadcanvas.cpp:330
 #: src/synfig/loadcanvas.cpp:500 src/synfig/loadcanvas.cpp:1279
 #, c-format
 msgid "<%s> should not contain anything"
-msgstr ""
+msgstr "<%s> не должен содержать ничего"
 
 #: src/synfig/loadcanvas.cpp:277 src/synfig/loadcanvas.cpp:296
 #: src/synfig/loadcanvas.cpp:315 src/synfig/loadcanvas.cpp:334
 #: src/synfig/loadcanvas.cpp:504 src/synfig/loadcanvas.cpp:1283
 #, c-format
 msgid "<%s> is missing \"value\" attribute"
-msgstr ""
+msgstr "<%s> отсутствует атрибут \"value\""
 
 #: src/synfig/loadcanvas.cpp:515 src/synfig/loadcanvas.cpp:1468
 #: src/synfig/loadcanvas.cpp:1486
@@ -2539,12 +2632,12 @@ msgstr "Некорректное значение \"%s\" в <%s>"
 #: src/synfig/loadcanvas.cpp:539
 #, c-format
 msgid "<%s> is missing \"pos\" attribute"
-msgstr ""
+msgstr "<%s> отсутствует атрибут \"pos\""
 
 #: src/synfig/loadcanvas.cpp:1679
 #, c-format
 msgid "Unable to create <animated> with type \"%s\""
-msgstr ""
+msgstr "Не удалось создать <animated> с типом \"%s\""
 
 #: src/synfig/loadcanvas.cpp:1701
 msgid "<waypoint> is missing attribute \"time\""
@@ -2560,7 +2653,7 @@ msgstr ""
 #: src/synfig/loadcanvas.cpp:1730
 #, c-format
 msgid "Unknown ID (%s) referenced in waypoint"
-msgstr ""
+msgstr "Неизвестный идентификатор (%s) указан в путевой точке waypoint"
 
 #: src/synfig/loadcanvas.cpp:1736 src/synfig/loadcanvas.cpp:1748
 #, c-format
@@ -2569,32 +2662,32 @@ msgstr "В <%s> отсутствуют данные"
 
 #: src/synfig/loadcanvas.cpp:1765
 msgid "Bad data for <waypoint>"
-msgstr ""
+msgstr "Некорректные данные для <waypoint>"
 
 #: src/synfig/loadcanvas.cpp:1781
 #, c-format
 msgid "Unexpected element <%s> after <waypoint> data, ignoring..."
-msgstr ""
+msgstr "Неожиданный элемент <%s> после данных <waypoint>,  игнорирование..."
 
 #: src/synfig/loadcanvas.cpp:1882
 #, c-format
 msgid "Missing attribute \"type\" in <%s>"
-msgstr ""
+msgstr "Пропущен атрибут \"type\" в <%s>"
 
 #: src/synfig/loadcanvas.cpp:1891
 #, c-format
 msgid "Bad type in <%s>"
-msgstr ""
+msgstr "Некорректный тип в <%s>"
 
 #: src/synfig/loadcanvas.cpp:1903
 #, c-format
 msgid "Error creating ValueNode <%s> with type '%s'.  Refer to '%s'"
-msgstr ""
+msgstr "Ошибка создания значения узла <%s> с типом '%s'. Ссылается на '%s'"
 
 #: src/synfig/loadcanvas.cpp:1913
 #, c-format
 msgid "<%s> did not accept type '%s'"
-msgstr ""
+msgstr "<%s> не принимает тип '%s'"
 
 #: src/synfig/loadcanvas.cpp:1945 src/synfig/loadcanvas.cpp:2032
 #, c-format
@@ -2604,17 +2697,19 @@ msgstr "'%s' уже определено в <%s>"
 #: src/synfig/loadcanvas.cpp:1958
 #, c-format
 msgid "'%s' attribute in <%s> references unknown ID '%s'"
-msgstr ""
+msgstr "'%s' атрибут в <%s> ссылается на неизвестный идентификатор '%s'"
 
 #: src/synfig/loadcanvas.cpp:1976
 #, c-format
 msgid "Unable to set link '\"%s\" to ValueNode \"%s\" (link #%d in \"%s\")"
 msgstr ""
+"Не удалось установить ссылку '\"%s\" на значение узла \"%s\" (ссылка #%d в "
+"\"%s\")"
 
 #: src/synfig/loadcanvas.cpp:2000
 #, c-format
 msgid "Unknown Exception thrown when referencing ValueNode \"%s\""
-msgstr ""
+msgstr "Неизвестное исключение при обращении к значению узла \"%s\""
 
 #: src/synfig/loadcanvas.cpp:2047
 #, c-format
@@ -2630,28 +2725,29 @@ msgstr "Разбор '%s' завершился неудачей"
 #, c-format
 msgid "Unable to connect value node ('%s' of type '%s') to link %d (%s)"
 msgstr ""
+"Не удалось присоединить значение узла ('%s' типа '%s') к ссылке %d (%s)"
 
 #: src/synfig/loadcanvas.cpp:2090
 #, c-format
 msgid "Unknown Exception thrown when working on element \"%s\""
-msgstr ""
+msgstr "Неизвестное исключение при работе над элементом \"%s\""
 
 #: src/synfig/loadcanvas.cpp:2191
 #, c-format
 msgid "<%s> is missing link %d (%s)"
-msgstr ""
+msgstr "<%s> отсутствует ссылка %d (%s)"
 
 #: src/synfig/loadcanvas.cpp:2241
 msgid "Unable to create <list>"
-msgstr ""
+msgstr "Не удалось создать <list>"
 
 #: src/synfig/loadcanvas.cpp:2283 src/synfig/loadcanvas.cpp:2546
 msgid "<entry> is missing its contents or missing \"use\" element"
-msgstr ""
+msgstr "<entry> отсутствует его содержимое или отсутствует элемент \"use\""
 
 #: src/synfig/loadcanvas.cpp:2394
 msgid "Unable to create <dynamic_list>"
-msgstr ""
+msgstr "Не удалось создать <dynamic_list>"
 
 #: src/synfig/loadcanvas.cpp:2616
 #, c-format
@@ -2661,7 +2757,7 @@ msgstr "Некорректные данные в <%s>"
 #: src/synfig/loadcanvas.cpp:2682
 #, c-format
 msgid "Expected a ValueNode.  Refer to '%s'"
-msgstr ""
+msgstr "Ожидалось значение узла. Ссылается на '%s'"
 
 #: src/synfig/loadcanvas.cpp:2703
 #, c-format
@@ -2671,131 +2767,133 @@ msgstr "Некорректный ID \"%s\""
 #: src/synfig/loadcanvas.cpp:2709
 #, c-format
 msgid "Duplicate ID \"%s\""
-msgstr ""
+msgstr "Дублирующий идентификатор \"%s\""
 
 #: src/synfig/loadcanvas.cpp:2715
 #, c-format
 msgid "Unknown Exception thrown when adding ValueNode \"%s\""
-msgstr ""
+msgstr "Неизвестное исключение при добавлении значения узла \"%s\""
 
 #: src/synfig/loadcanvas.cpp:2772
 msgid "Missing \"type\" attribute to \"layer\" element"
-msgstr ""
+msgstr "Пропущен атрибут \"type\" для элемента \"layer\""
 
 #: src/synfig/loadcanvas.cpp:2792
 msgid "Installed layer version is smaller than layer version in file"
-msgstr ""
+msgstr "Установленная версия слоя меньше, чем версия слоя в файле"
 
 #: src/synfig/loadcanvas.cpp:2841
 msgid "<name> entry for <layer> is not yet supported. Ignoring..."
-msgstr ""
+msgstr "<name> запись для <layer> ещё не поддерживается. Игнорирование..."
 
 #: src/synfig/loadcanvas.cpp:2844
 msgid "<desc> entry for <layer> is not yet supported. Ignoring..."
-msgstr ""
+msgstr "<desc> запись для <layer> ещё не поддерживается. Игнорирование..."
 
 #: src/synfig/loadcanvas.cpp:2852
 msgid "Missing \"name\" attribute for <param>."
-msgstr ""
+msgstr "Пропущен атрибут \"name\" для <param>."
 
 #: src/synfig/loadcanvas.cpp:2869
 msgid ""
 "Found \"use\" attribute for <param>, but it wasn't empty. Ignoring "
 "contents..."
 msgstr ""
+"У <param> найден заполненный атрибут \"use\". Содержимое игнорируется..."
 
 #: src/synfig/loadcanvas.cpp:2874
 msgid "Empty use=\"\" value in <param>"
-msgstr ""
+msgstr "Пустое значение use=\"\" в <param>"
 
 #: src/synfig/loadcanvas.cpp:2880
 #, c-format
 msgid "Failed to load subcanvas '%s'"
-msgstr ""
+msgstr "Неудача загрузки вложенного холста '%s'"
 
 #: src/synfig/loadcanvas.cpp:2882
 msgid "Layer rejected canvas link"
-msgstr ""
+msgstr "Слой отклонил ссылку холста"
 
 #: src/synfig/loadcanvas.cpp:2935
 #, c-format
 msgid "Unknown ID (%s) referenced in parameter \"%s\""
-msgstr ""
+msgstr "Неизвестный идентификатор (%s) указан в параметре \"%s\""
 
 #: src/synfig/loadcanvas.cpp:2951
 msgid "<param> is either missing its contents, or missing a \"use\" attribute."
 msgstr ""
+"<param> или отсутствует его содержимое, или отсутствует атрибут \"use\""
 
 #: src/synfig/loadcanvas.cpp:2966 src/synfig/loadcanvas.cpp:2976
 msgid "Bad data for <param>"
-msgstr ""
+msgstr "Некорректные данные для <param>"
 
 #: src/synfig/loadcanvas.cpp:3021
 #, c-format
 msgid "Layer '%s' rejected value for parameter '%s'"
-msgstr ""
+msgstr "Слой '%s' отклонил значение параметра '%s'"
 
 #: src/synfig/loadcanvas.cpp:3032
 #, c-format
 msgid "Unexpected element <%s> after <param> data, ignoring..."
-msgstr ""
+msgstr "Неожиданный элемент <%s> после данных <param>,  игнорирование..."
 
 #: src/synfig/loadcanvas.cpp:3149 src/synfig/loadcanvas.cpp:3157
 msgid "Canvas with width or height less than one is not allowed"
-msgstr ""
+msgstr "Холст с шириной или высотой менее единицы не допускается"
 
 #: src/synfig/loadcanvas.cpp:3244
 msgid "Group canvases cannot have a <defs> section"
-msgstr ""
+msgstr "Группа холстов не может иметь секцию <defs>"
 
 #: src/synfig/loadcanvas.cpp:3251
 msgid "Inline canvas cannot have a <bones> section"
-msgstr ""
+msgstr "Встроенные холсты не могут иметь секцию <bones>"
 
 #: src/synfig/loadcanvas.cpp:3259
 msgid "Group canvases cannot have keyframes"
-msgstr ""
+msgstr "Группа холстов не может иметь ключевые кадры"
 
 #: src/synfig/loadcanvas.cpp:3271
 msgid "Group canvases cannot have metadata"
-msgstr ""
+msgstr "Группа холстов не может иметь метаданные"
 
 #: src/synfig/loadcanvas.cpp:3277
 msgid "<meta> must have a name"
-msgstr ""
+msgstr "<meta> должно иметь имя"
 
 #: src/synfig/loadcanvas.cpp:3283
 msgid "<meta> must have content"
-msgstr ""
+msgstr "<meta> должно иметь содержимое"
 
 #: src/synfig/loadcanvas.cpp:3323
 msgid "blank \"name\" entity"
-msgstr ""
+msgstr "пустой объект \"name\""
 
 #: src/synfig/loadcanvas.cpp:3338
 msgid "blank \"desc\" entity"
-msgstr ""
+msgstr "пустой объект \"desc\""
 
 #: src/synfig/loadcanvas.cpp:3353
 msgid "blank \"author\" entity"
-msgstr ""
+msgstr "пустой объект \"author\""
 
 #: src/synfig/loadcanvas.cpp:3388
 #, c-format
 msgid "Canvas '%s' has undefined %s: %s"
-msgstr ""
+msgstr "Слой '%s' имеет неопределённый %s: %s"
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
-msgstr "ValueNode"
+msgstr "Значение узла"
 
 #: src/synfig/loadcanvas.cpp:3390
 msgid "ValueNodes"
-msgstr ""
+msgstr "Значения узла"
 
 #: src/synfig/loadcanvas.cpp:3470
 msgid "Can't find linked file"
-msgstr ""
+msgstr "Не удалось найти связанный файл"
 
 #: src/synfig/loadcanvas.cpp:3481 src/synfig/loadcanvas.cpp:3537
 msgid "Can't open file"
@@ -2804,96 +2902,96 @@ msgstr "Не удалось открыть файл"
 #: src/synfig/main.cpp:123
 #, c-format
 msgid "API Version mismatch (LIB:%d, PROG:%d)"
-msgstr ""
+msgstr "Несоответствие версии API (БИБ-КА:%d, ПРОГРАММА:%d)"
 
 #: src/synfig/main.cpp:128
 #, c-format
 msgid "Size of Vector mismatch (app:%d, lib:%d)"
-msgstr ""
+msgstr "Несоответствие размера вектора (приложение:%d, биб-ка:%d)"
 
 #: src/synfig/main.cpp:133
 #, c-format
 msgid "Size of Color mismatch (app:%d, lib:%d)"
-msgstr ""
+msgstr "Несоответствие размера цвета (приложение:%d, биб-ка:%d)"
 
 #: src/synfig/main.cpp:138
 #, c-format
 msgid "Size of Canvas mismatch (app:%d, lib:%d)"
-msgstr ""
+msgstr "Несоответствие размера холста (приложение:%d, биб-ка:%d)"
 
 #: src/synfig/main.cpp:143
 #, c-format
 msgid "Size of Layer mismatch (app:%d, lib:%d)"
-msgstr ""
+msgstr "Несоответствие размера слоя (приложение:%d, биб-ка:%d)"
 
 #: src/synfig/main.cpp:215
 msgid "Starting Subsystem \"Sound\""
-msgstr ""
+msgstr "Запускается подсистема \"Звук\""
 
 #: src/synfig/main.cpp:217
 msgid "Unable to initialize subsystem \"Sound\""
-msgstr ""
+msgstr "Невозможно инициализировать подсистему \"Звук\""
 
 #: src/synfig/main.cpp:219
 msgid "Starting Subsystem \"Types\""
-msgstr ""
+msgstr "Запускается подсистема \"Типы\""
 
 #: src/synfig/main.cpp:221
 msgid "Unable to initialize subsystem \"Types\""
-msgstr ""
+msgstr "Невозможно инициализировать подсистему \"Типы\""
 
 #: src/synfig/main.cpp:223
 msgid "Starting Subsystem \"Modules\""
-msgstr ""
+msgstr "Запускается подсистема \"Модули\""
 
 #: src/synfig/main.cpp:227
 msgid "Unable to initialize subsystem \"Modules\""
-msgstr ""
+msgstr "Невозможно инициализировать подсистему \"Модули\""
 
 #: src/synfig/main.cpp:230
 msgid "Starting Subsystem \"Layers\""
-msgstr ""
+msgstr "Запускается подсистема \"Слои\""
 
 #: src/synfig/main.cpp:235
 msgid "Unable to initialize subsystem \"Layers\""
-msgstr ""
+msgstr "Невозможно инициализировать подсистему \"Слои\""
 
 #: src/synfig/main.cpp:238
 msgid "Starting Subsystem \"Targets\""
-msgstr ""
+msgstr "Запускается подсистема \"Цели\""
 
 #: src/synfig/main.cpp:244
 msgid "Unable to initialize subsystem \"Targets\""
-msgstr ""
+msgstr "Невозможно инициализировать подсистему \"Цели\""
 
 #: src/synfig/main.cpp:247
 msgid "Starting Subsystem \"Importers\""
-msgstr ""
+msgstr "Запускается подсистема \"Импортёры\""
 
 #: src/synfig/main.cpp:254
 msgid "Unable to initialize subsystem \"Importers\""
-msgstr ""
+msgstr "Невозможно инициализировать подсистему \"Импортёры\""
 
 #: src/synfig/main.cpp:257
 msgid "Starting Subsystem \"Cairo Importers\""
-msgstr ""
+msgstr "Запускается подсистема \"Импортёры Cairo\""
 
 #: src/synfig/main.cpp:265
 msgid "Unable to initialize subsystem \"Cairo Importers\""
-msgstr ""
+msgstr "Невозможно инициализировать подсистему \"Импортёры Cairo\""
 
 #: src/synfig/main.cpp:268
 msgid "Starting Subsystem \"ValueNodes\""
-msgstr ""
+msgstr "Запускается подсистема \"Значения узла\""
 
 #: src/synfig/main.cpp:277
 msgid "Unable to initialize subsystem \"ValueNodes\""
-msgstr ""
+msgstr "Невозможно инициализировать подсистему \"Значения узла\""
 
 #: src/synfig/main.cpp:314 src/synfig/main.cpp:315
 #, c-format
 msgid "Loading modules from %s"
-msgstr ""
+msgstr "Загружается модуль из %s"
 
 #: src/synfig/main.cpp:327
 #, c-format
@@ -2910,15 +3008,15 @@ msgstr "ошибка"
 
 #: src/synfig/main.cpp:424 src/tool/progress.h:55
 msgid "warning"
-msgstr ""
+msgstr "предупреждение"
 
 #: src/synfig/main.cpp:439
 msgid "info"
-msgstr ""
+msgstr "информация"
 
 #: src/synfig/module.cpp:65
 msgid "Errors on lt_dlinit()"
-msgstr ""
+msgstr "Ошибки в lt_dlinit()"
 
 #: src/synfig/module.cpp:102
 #, c-format
@@ -2943,16 +3041,16 @@ msgstr "Найден модуль \"%s\""
 #: src/synfig/module.cpp:173
 #, c-format
 msgid "Unable to find entrypoint in module \"%s\" (%s)"
-msgstr ""
+msgstr "Невозможно найти точку входа в модуль \"%s\" (%s)"
 
 #: src/synfig/module.cpp:186
 msgid "Entrypoint did not return a module."
-msgstr ""
+msgstr "Точка входа не вернула модуль."
 
 #: src/synfig/module.cpp:190
 #, c-format
 msgid "Success for \"%s\""
-msgstr ""
+msgstr "Успешно для \"%s\""
 
 #: src/synfig/palette.cpp:79
 msgid "Unnamed"
@@ -2960,137 +3058,140 @@ msgstr "Без названия"
 
 #: src/synfig/palette.cpp:96
 msgid "Surface Palette"
-msgstr ""
+msgstr "Палитра поверхности"
 
 #: src/synfig/palette.cpp:291
 #, c-format
 msgid "%0.2f%% Gray"
-msgstr ""
+msgstr "%0.2f%% Серый"
 
 #: src/synfig/palette.cpp:306
 #, c-format
 msgid "Unable to open %s for write"
-msgstr ""
+msgstr "Невозможно открыть %s для записи"
 
 #: src/synfig/palette.cpp:328
 #, c-format
 msgid "Unable to open %s for read"
-msgstr ""
+msgstr "Невозможно открыть %s для чтения"
 
 #: src/synfig/palette.cpp:340 src/synfig/palette.cpp:382
 #, c-format
 msgid "%s does not appear to be a valid %s palette file"
-msgstr ""
+msgstr "%s кажется не является корректным файлом палитры %s"
 
 #: src/synfig/palette.cpp:437
 #, c-format
 msgid "%s does not appear to be a supported palette file"
-msgstr ""
+msgstr "%s кажется не является поддерживаемым файлом палитры"
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
-msgstr ""
+msgstr "Совмещение"
 
 #: src/synfig/paramdesc.cpp:69
 msgid "Straight"
-msgstr ""
+msgstr "Прямой"
 
 #: src/synfig/paramdesc.cpp:70
 msgid "Onto"
-msgstr ""
+msgstr "На"
 
 #: src/synfig/paramdesc.cpp:71
 msgid "Straight Onto"
-msgstr ""
+msgstr "Прямо на"
 
 #: src/synfig/paramdesc.cpp:72
 msgid "Behind"
-msgstr ""
+msgstr "Позади"
 
 #: src/synfig/paramdesc.cpp:73
 msgid "Screen"
-msgstr ""
+msgstr "Экран"
 
 #: src/synfig/paramdesc.cpp:74
 msgid "Overlay"
-msgstr ""
+msgstr "Перекрытие"
 
 #: src/synfig/paramdesc.cpp:75
 msgid "Hard Light"
-msgstr ""
+msgstr "Направленный свет"
 
 #: src/synfig/paramdesc.cpp:76
 msgid "Multiply"
-msgstr ""
+msgstr "Умножать"
 
 #: src/synfig/paramdesc.cpp:77
 msgid "Divide"
-msgstr ""
+msgstr "Пунктир 2"
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr "Сумма"
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr "Вычитание"
 
 #: src/synfig/paramdesc.cpp:80
 msgid "Difference"
-msgstr ""
+msgstr "Разность"
 
 #: src/synfig/paramdesc.cpp:81
 msgid "Brighten"
-msgstr ""
+msgstr "Осветление"
 
 #: src/synfig/paramdesc.cpp:82
 msgid "Darken"
-msgstr ""
+msgstr "Затемнение"
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr "Тон"
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr "Насыщенность"
 
 #: src/synfig/paramdesc.cpp:86
 msgid "Luminance"
-msgstr ""
+msgstr "Яркость"
 
 #: src/synfig/paramdesc.cpp:87
 msgid "Alpha Over"
-msgstr ""
+msgstr "Альфа-канал над"
 
 #: src/synfig/paramdesc.cpp:88
 msgid "Alpha Brighten"
-msgstr ""
+msgstr "Осветление альфа-канала"
 
 #: src/synfig/paramdesc.cpp:89
 msgid "Alpha Darken"
-msgstr ""
+msgstr "Затемнение альфа-канала"
 
 #: src/synfig/render.cpp:248 src/synfig/render.cpp:249
 #: src/synfig/render.cpp:303 src/synfig/render.cpp:304
 #: src/synfig/render.cpp:574 src/synfig/render.cpp:575
 #: src/synfig/render.cpp:601 src/synfig/render.cpp:602
 msgid "Target panic"
-msgstr ""
+msgstr "Паника из-за цели"
 
 #: src/synfig/savecanvas.cpp:439
 #, c-format
 msgid "Unknown value(%s), cannot create XML representation!"
-msgstr ""
+msgstr "Неизвестное значение (%s), не удаётся создать представление XML!"
 
 #: src/synfig/savecanvas.cpp:753 src/synfig/savecanvas.cpp:778
 #, c-format
 msgid "Unknown ValueNode Type (%s), cannot create an XML representation"
 msgstr ""
+"Неизвестный тип значения узла (%s), не удаётся создать представление XML!"
 
 #: src/synfig/target_cairo.cpp:92 src/synfig/target_cairo_tile.cpp:194
 #: src/synfig/target_scanline.cpp:98 src/synfig/target_tile.cpp:411
@@ -3099,1628 +3200,1715 @@ msgstr "Ошибка при инициализации цели"
 
 #: src/synfig/target_cairo.cpp:155
 msgid "Frame Renderer Failure"
-msgstr ""
+msgstr "Не удалось визуализировать кадр"
 
 #: src/synfig/target_cairo.cpp:165 src/synfig/target_scanline.cpp:274
 #: src/synfig/target_scanline.cpp:435
 msgid "Unable to put surface on target"
-msgstr ""
+msgstr "Не удается положить поверхность на цель"
 
 #: src/synfig/target_cairo.cpp:173
 msgid "Not supported render method"
-msgstr ""
+msgstr "Не поддерживаемый метод визуализации"
 
 #: src/synfig/target_cairo.cpp:180 src/synfig/target_cairo_tile.cpp:259
 #: src/synfig/target_scanline.cpp:448 src/synfig/target_tile.cpp:528
 msgid "Caught string :"
-msgstr ""
+msgstr "Пойманная строка:"
 
 #: src/synfig/target_cairo.cpp:185 src/synfig/target_cairo_tile.cpp:264
 #: src/synfig/target_scanline.cpp:453 src/synfig/target_tile.cpp:533
 msgid "Ran out of memory (Probably a bug)"
-msgstr ""
+msgstr "Выход за пределы памяти (Возможно ошибка)"
 
 #: src/synfig/target_cairo.cpp:190 src/synfig/target_cairo_tile.cpp:269
 #: src/synfig/target_scanline.cpp:458 src/synfig/target_tile.cpp:538
 msgid "Caught unknown error, rethrowing..."
-msgstr ""
+msgstr "Поймана неизвестная ошибка, повторное выбрасывание ..."
 
 #: src/synfig/target_cairo_tile.cpp:104 src/synfig/target_tile.cpp:184
 msgid "Bad Tile Size"
-msgstr ""
+msgstr "Плохой размер плитки"
 
 #: src/synfig/target_cairo_tile.cpp:148 src/synfig/target_cairo_tile.cpp:251
 #: src/synfig/target_scanline.cpp:205 src/synfig/target_scanline.cpp:265
 #: src/synfig/target_scanline.cpp:364 src/synfig/target_scanline.cpp:426
 #: src/synfig/target_tile.cpp:326
 msgid "Accelerated Renderer Failure"
-msgstr ""
+msgstr "Неудача ускоренного отрисовщика"
 
 #: src/synfig/target_cairo_tile.cpp:157
 #, c-format
 msgid "Bad surface: %s"
-msgstr ""
+msgstr "Плохая поверхность: %s"
 
 #: src/synfig/target_cairo_tile.cpp:164 src/synfig/target_tile.cpp:266
 #: src/synfig/target_tile.cpp:375
 msgid "add_tile():Unable to put surface on target"
-msgstr ""
+msgstr "add_tile():Не удается положить поверхность на цель"
 
 #: src/synfig/target_cairo_tile.cpp:222
 msgid "Can't start frame"
-msgstr ""
+msgstr "Не удалось запустить кадр"
 
 #: src/synfig/target_tile.cpp:234
 msgid "Parametric Renderer Failure"
-msgstr ""
+msgstr "Неудача параметрического отрисовщика"
 
 #: src/synfig/target_tile.cpp:241 src/synfig/target_tile.cpp:332
 msgid "Bad surface"
-msgstr ""
+msgstr "Плохая поверхность"
 
 #: src/synfig/time.cpp:111
 #, c-format
 msgid "Time(): No unit provided in time code, assuming FRAMES (\"%s\")"
 msgstr ""
+"Time(): нет блока, предоставленного в тайм-коде, предполагаются КАДРЫ (\"%s"
+"\")"
 
 #: src/synfig/time.cpp:116
 msgid ""
 "Time(): No unit provided in time code and frame rate is unknown! Assuming "
 "SECONDS"
 msgstr ""
+"Time(): нет блока, предоставленного в тайм-коде, и частота кадров "
+"неизвестна! Предполагаются СЕКУНДЫ"
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
-msgstr ""
+msgstr "Радиальное совмещение"
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
-msgstr "Reference"
+msgstr "Ссылка"
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
-msgstr ""
+msgstr "Касательная сегмента"
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr "Вершина сегмента"
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
-msgstr ""
+msgstr "Полоски"
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
-msgstr ""
+msgstr "Двух-тонный"
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
-msgstr "динамический список"
+msgstr "Динамический список"
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
-msgstr ""
+msgstr "Вращение градиента"
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr "Синус"
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
-msgstr ""
+msgstr "Временный своп"
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
-msgstr ""
+msgstr "Повторить градиент"
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr "Экспонента"
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
-msgstr ""
+msgstr "Касательная кривой"
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
-msgstr ""
+msgstr "Вершина кривой"
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr "Диапазон"
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr "Косинус"
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
-msgstr ""
+msgstr "aTan2"
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
-msgstr ""
+msgstr "Обратная касательная"
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr "Обратное значение"
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr "Целое"
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr "Толщина кривой"
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr "Угол вектора"
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr "Длина вектора"
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
-msgstr ""
+msgstr "Вектор X"
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
-msgstr ""
+msgstr "Вектор Y"
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr "Цвет градиента"
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr "Скалярное произведение"
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
-msgstr ""
+msgstr "Временная строка"
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
-msgstr "Real"
+msgstr "Вещественный"
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
-msgstr ""
+msgstr "Настоящая строка"
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr "Объединённый список"
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
-msgstr ""
+msgstr "Угловая строка"
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
-msgstr ""
+msgstr "Целая строка"
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr "Логарифм"
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr "Заблокированный"
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr "Степень"
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
-msgstr ""
+msgstr "Сравнение"
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr "НЕ"
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr "И"
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr "ИЛИ"
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
-msgstr ""
+msgstr "Воздействие кости"
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr "Кость"
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
-msgstr ""
+msgstr "Корневая кость"
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
-msgstr ""
+msgstr "Список статистики"
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
-msgstr ""
+msgstr "Весовая пара кости"
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
-msgstr ""
+msgstr "Связь кости"
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
-msgstr ""
+msgstr "Список WP"
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
-msgstr ""
+msgstr "Список DI"
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
-msgstr ""
+msgstr "Средняя"
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
-msgstr ""
+msgstr "Средневзвешенное"
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
-msgstr ""
+msgstr "Динамический"
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
-msgstr ""
+msgstr "Производная"
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
-msgstr ""
+msgstr "Плохой тип: Значение узла '%s' не принимает тип '%s'"
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr "Заглушка"
 
 #: src/synfig/valuenode.h:62
 #, c-format
 msgid "%s:%d wrong type for %s: need %s but got %s"
-msgstr ""
-
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+msgstr "%s:%d неверный тип для %s: нужен %s, но получен %s"
+
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
-msgstr ""
+msgstr ":Некорректный тип"
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
-msgstr ""
+msgstr "Один или оба из моих параметров не установлен!"
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr "LHS"
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
-msgstr ""
+msgstr "Левая сторона сложения"
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr "RHS"
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
-msgstr ""
+msgstr "Правая сторона надстройки"
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
-msgstr ""
+msgstr "Скаляр"
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
-msgstr ""
+msgstr "Значение, которое умножает надстройку"
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr "И"
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr "Связь 1"
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
-msgstr ""
+msgstr "Первый операнд из операции И"
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr "Связь 2"
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
-msgstr ""
+msgstr "Второй операнд из операции И"
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
-msgstr ""
+msgstr "Значение для преобразования в строку"
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
-msgstr ""
+msgstr "Ширина строки"
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr "Точность"
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
-msgstr ""
+msgstr "Количество знаков после запятой"
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
-msgstr ""
+msgstr "Дополнено нулями"
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
+"Когда включено, строка слева заполняется нулями, чтобы соответствовать ширине"
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
-msgstr ""
+msgstr "В этой точке времени уже есть фиксатор"
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
-msgstr ""
+msgstr "%s: Вы не можете использовать %s в анимированном значении узла"
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
-msgstr ""
+msgstr "Анимировано"
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr "X"
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
-msgstr ""
+msgstr "Косинус угла"
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
-msgstr ""
+msgstr "Y"
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
-msgstr ""
+msgstr "Синус угла"
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr "Нет записей в списке"
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr "Нет записей в ret_list"
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr "Вершина %03d"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
-msgstr ""
+msgstr "Кривая, где касательная связана"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
-msgstr ""
+msgstr "Когда включено, сумма будет циклом"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
-msgstr ""
+msgstr "Положение связанной касательной на кривой (0,1]"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr "Смещение"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
-msgstr ""
+msgstr "Угол смещения касательной"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
-msgstr ""
+msgstr "Шкала касательной"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr "Фиксированная длина"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
-msgstr ""
+msgstr "Когда включено, длина касательной является фиксированной"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
-msgstr ""
+msgstr "Когда включено, касательная основана на длине кривой"
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
-msgstr ""
+msgstr "Кривая, где вершина связана"
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
-msgstr ""
+msgstr "Позиция связанного угла на касательной (0,1]"
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
-msgstr ""
+msgstr "Когда включено, позиция основана на длине кривой"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
-msgstr ""
+msgstr "Кривая, где ширина связана"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
-msgstr ""
+msgstr "Позиция связанной ширины на кривой (0,1]"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
-msgstr ""
+msgstr "Шкала ширины"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
-msgstr ""
+msgstr "Когда включено, ширина основана на длине кривой"
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
-msgstr ""
+msgstr "Связанная касательная для реверсирования"
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
-msgstr ""
+msgstr "Когда включено, ссылка реверсирована"
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
-msgstr ""
+msgstr "Кость %d"
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
-msgstr ""
+msgstr "Имя кости"
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
-msgstr ""
+msgstr "Как у родительского узла"
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
-msgstr ""
+msgstr "Родительская кость кости"
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
-msgstr ""
+msgstr "Вращающееся начало кости по отношению к её родителям"
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
-msgstr ""
+msgstr "Вращающийся угол кости по отношению к его родителям"
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
-msgstr ""
+msgstr "Шкала локальной длины"
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
-msgstr ""
+msgstr "Масштаб кости соответствует её длине"
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
-msgstr ""
+msgstr "Ширина кости"
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
-msgstr ""
+msgstr "Ширина кости на её происхождении"
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
-msgstr ""
+msgstr "Шкала рекурсивной длины"
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
-msgstr ""
+msgstr "Масштаб кости и её детей соответствует её длине"
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
-msgstr ""
+msgstr "Ширина кончика"
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
-msgstr ""
+msgstr "Ширина кости на её кончике"
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
-msgstr ""
+msgstr "Глубина на оси Z"
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
-msgstr ""
+msgstr "Z-глубина кости"
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
-msgstr ""
+msgstr "Установка длины"
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
-msgstr ""
+msgstr "Длина кости в установке"
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
-msgstr ""
+msgstr "Корень"
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
-msgstr ""
+msgstr "Список масс костей"
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
-msgstr ""
+msgstr "Список костей используется для расчёта влияния"
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
-msgstr ""
+msgstr "Значение узла, находящееся под влиянием кости"
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
-msgstr ""
+msgstr "Связанная кость"
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
-msgstr ""
+msgstr "Базовое значение"
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
-msgstr ""
+msgstr "Сделать перевод"
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
-msgstr ""
+msgstr "Сделать поворот"
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
-msgstr ""
+msgstr "Наклон"
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
-msgstr ""
+msgstr "Сделать наклон"
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
-msgstr ""
+msgstr "Масштаб по X"
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
-msgstr ""
+msgstr "Сделать масштабирования по оси Х"
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
-msgstr ""
+msgstr "Масштаб по Y"
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
-msgstr ""
+msgstr "Сделать масштабирования по оси Y"
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
-msgstr ""
+msgstr "Кость, использованная чтобы создать влияние"
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
-msgstr ""
+msgstr "вес"
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
-msgstr ""
+msgstr "Относительная величина влияния кости"
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
-msgstr ""
+msgstr "Левая сторона сравнения"
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
-msgstr ""
+msgstr "Правая сторона сравнения"
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
-msgstr ""
+msgstr "Больше"
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
-msgstr ""
+msgstr "Когда включено, возвращает истину если LHS > RHS"
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
-msgstr ""
+msgstr "Равняется"
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
-msgstr ""
+msgstr "Когда включено, возвращает истину если LHS = RHS"
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
-msgstr ""
+msgstr "Меньше"
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
-msgstr ""
+msgstr "Когда включено, возвращает истину если LHS < RHS"
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
-msgstr ""
+msgstr "Неверныйтип для комбинации"
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr "Красный"
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
-msgstr ""
+msgstr "Значение красного канала цвета"
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr "Зеленый"
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
-msgstr ""
+msgstr "Значение зеленого канала цвета"
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr "Синий"
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
-msgstr ""
+msgstr "Значение синего канала цвета"
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr "Прозрачность"
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
-msgstr ""
+msgstr "Альфа-канал цвета"
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr "Вершина 1"
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
-msgstr ""
+msgstr "Первая вершина сегмента"
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr "Касательная 1"
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
-msgstr ""
+msgstr "Первая касательная сегмента"
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr "Вершина 2"
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
-msgstr ""
+msgstr "Вторая вершина сегмента"
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr "Касательная 2"
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
-msgstr ""
+msgstr "Вторая касательная сегмента"
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
-msgstr ""
+msgstr "Ось X"
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
-msgstr ""
+msgstr "Компонент X-ось вектора"
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
-msgstr ""
+msgstr "Ось Y"
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
-msgstr ""
+msgstr "Компонент Y-ось вектора"
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr "Вершина"
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
-msgstr ""
+msgstr "Вершина точки кривой"
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
-msgstr ""
+msgstr "Ширина точки кривой"
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
-msgstr ""
+msgstr "Определяет выключение и включение позиции по отношению к соседям"
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
-msgstr ""
+msgstr "Разделить"
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
-msgstr ""
+msgstr "Когда включено, касательные являются независимыми"
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
-msgstr ""
+msgstr "Первая касательная точки кривой"
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
-msgstr ""
+msgstr "Вторая касательная точки кривой"
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
-msgstr ""
+msgstr "Разделитель радиуса"
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
-msgstr ""
+msgstr "Когда включено, радиусы касательных являются независимыми"
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
-msgstr ""
+msgstr "Разделитель угла"
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
-msgstr ""
+msgstr "Когда включено, углы касательных являются независимыми"
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
-msgstr ""
+msgstr "Позиция [0,1] ширины точки над кривой"
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
-msgstr ""
+msgstr "Ширина точки ширины"
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
-msgstr ""
+msgstr "Тип стороны до"
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
-msgstr ""
+msgstr "Определяет тип интерполяции по ширине точки"
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr "Интерполировать"
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
-msgstr ""
+msgstr "Тип стороны после"
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
-msgstr ""
+msgstr "Нижняя граница"
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
-msgstr ""
+msgstr "Определяет позицию в начале кривой"
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
-msgstr ""
+msgstr "Верхняя граница"
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
-msgstr ""
+msgstr "Определяет позицию в конце кривой"
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
-msgstr ""
+msgstr "Длина смещения пунктирного элемента над кривой"
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr "Длина"
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
-msgstr ""
+msgstr "Длина пунктирного элемента"
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
-msgstr ""
+msgstr "Определяет тип стороны пунктирного элемента"
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
-msgstr ""
+msgstr "Компонент Смещение трансформации"
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
-msgstr ""
+msgstr "Компонент Угол трансформации"
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
-msgstr ""
+msgstr "Угол наклона"
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
-msgstr ""
+msgstr "Компонент Угол наклона трансформации"
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
-msgstr ""
+msgstr "Компонент Масштаб трансформации"
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
-msgstr ""
+msgstr "Вес значения"
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
-msgstr "Value"
+msgstr "Значение"
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
-msgstr ""
+msgstr "Значение"
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
-msgstr ""
+msgstr "Первый"
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
-msgstr ""
+msgstr "Первое значение"
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
-msgstr ""
+msgstr "сек."
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
-msgstr ""
+msgstr "Второе значение"
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
-msgstr ""
+msgstr "Значение для расчёта косинуса"
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr "Амплитуда"
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
-msgstr ""
+msgstr "Множитель полученного косинуса"
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
-msgstr ""
+msgstr "Значение для расчёта производной"
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
-msgstr ""
+msgstr "Интервал"
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
-msgstr ""
+msgstr "Интервал времени для расчёта конечных разностей"
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
-msgstr ""
+msgstr "Точность"
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
-msgstr ""
+msgstr "Точность производной"
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
-msgstr ""
+msgstr "Невысокий"
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
-msgstr ""
+msgstr "Отлично"
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
-msgstr ""
+msgstr "Очень высокое"
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
-msgstr ""
+msgstr "Порядок"
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
-msgstr ""
+msgstr "Порядок производной"
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
-msgstr ""
+msgstr "Первая производная"
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
-msgstr ""
+msgstr "Вторая производная"
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
-msgstr ""
+msgstr "Пунктирный элемент %03d"
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
-msgstr ""
+msgstr "Левая сторона точки продукта"
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
-msgstr ""
+msgstr "Правая сторона точки продукта"
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr "От"
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
-msgstr ""
+msgstr "Начальное значение индекса"
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr "До"
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
-msgstr ""
+msgstr "Конечное значение индекса"
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
-msgstr ""
+msgstr "Сумма инкрементации индекса"
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
-msgstr ""
+msgstr "Неподвижный кончик"
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
-msgstr ""
+msgstr "Положение равновесия наконечника без внешних сил"
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
-msgstr ""
+msgstr "Фундамент динамической системы"
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
-msgstr ""
+msgstr "Сила"
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
-msgstr ""
+msgstr "Внешнее усилие на центр тяжести масс"
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
-msgstr ""
+msgstr "Вращающий момент"
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
-msgstr ""
+msgstr "Внешний импульс, применённый в центре инерции"
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
-msgstr ""
+msgstr "Коэффициент затухания"
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
-msgstr ""
+msgstr "Радиальный коэффициент затухания динамической системы"
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
-msgstr ""
+msgstr "Коэффициент трения"
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
-msgstr ""
+msgstr "Коэффициент вращательного трения динамической системы"
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
-msgstr ""
+msgstr "Коэффициент пружины"
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
-msgstr ""
+msgstr "Радиальный коэффициент пружины динамической системы"
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
-msgstr ""
+msgstr "Коэффициент кручения"
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
-msgstr ""
+msgstr "Коэффициент кручения динамической системы"
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
-msgstr ""
+msgstr "Масса"
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
-msgstr ""
+msgstr "Масса динамической системы"
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
-msgstr ""
+msgstr "Момент инерции"
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
-msgstr ""
+msgstr "Момент инерции динамической системы"
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
-msgstr ""
+msgstr "Жёсткая пружина"
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
-msgstr ""
+msgstr "Когда включено, линейная пружина жёсткая"
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
-msgstr ""
+msgstr "Жёсткость кручения"
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
-msgstr ""
+msgstr "Когда включено, кручёная пружина жёсткая"
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
-msgstr ""
+msgstr "Начало перетаскивает кончик"
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
+"Когда включено, результат это начало + кончик, в противном случае результат "
+"это только кончик"
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
+"Тип списка не соответствует типу элемента, несоответствие отбрасывается"
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
-msgstr ""
+msgstr "Элемент %03d"
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr "Экспонента"
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
-msgstr ""
+msgstr "Значение чтобы поднять константу 'е'"
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
-msgstr ""
+msgstr "Множитель полученной экспоненты"
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
-msgstr ""
+msgstr "Градиент, откуда выбирается цвет"
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
-msgstr ""
+msgstr "Положение цвета в градиенте (0,1]"
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
-msgstr ""
+msgstr "Когда включено, индекс будет циклом"
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
-msgstr ""
+msgstr "Исходный градиент для поворота"
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
-msgstr ""
+msgstr "Сумма для смещения градиента"
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
-msgstr ""
+msgstr "Значение серым цветом"
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
-msgstr ""
+msgstr "Целочисленное значение для преобразования"
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
-msgstr ""
+msgstr "Целое"
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
-msgstr ""
+msgstr "Строки"
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
-msgstr ""
+msgstr "Список строк для присоединения"
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr "До"
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
-msgstr ""
+msgstr "Строка для размещения перед присоединёнными строками"
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr "Разделитель"
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
-msgstr ""
+msgstr "Строка для размещения между каждой присоединённой строкой"
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr "После"
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
-msgstr ""
+msgstr "Строка для размещения после присоединённых строк"
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
-msgstr "Частота"
+msgstr "Скорость"
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
-msgstr ""
+msgstr "Значение, умноженное текущим временем (в секундах)"
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
-msgstr ""
+msgstr "Наклон"
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
-msgstr ""
+msgstr "Возвращённое значение когда текущее время равно нулю"
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
-msgstr ""
+msgstr "Значение узла, используемое для расчёта натурального логарифма"
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
-msgstr ""
+msgstr "Эпсилон"
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
-msgstr ""
+msgstr "Значение, используемое для сравнения 'ссылки' с нулём"
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
-msgstr ""
+msgstr "Бесконечный"
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
-msgstr ""
+msgstr "Возвращаемое значение, когда результат имеет тенденцию к бесконечности"
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr "НЕ"
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
-msgstr ""
+msgstr "Значение узла, используемое чтобы сделать операцию НЕТ"
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr "ИЛИ"
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
-msgstr ""
+msgstr "Значение узла, используемое для булевой операции ИЛИ"
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
-msgstr ""
+msgstr "Основа"
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
-msgstr ""
+msgstr "Основание, возведённое в степень"
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
-msgstr ""
+msgstr "Степень, используемая для возведения основания"
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
-msgstr ""
+msgstr "Значение, используемое для сравнения основания или степени с нулём"
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
-msgstr ""
+msgstr "Неверный тип для радиальной комбинации"
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
-msgstr "Luma"
+msgstr "Светимость"
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr "Длина вектора"
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr "Тета"
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
-msgstr ""
+msgstr "Угол вектора с осью X"
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
-msgstr ""
+msgstr "Несколько из моих параметров не установлены!"
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr "Мин"
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
-msgstr ""
+msgstr "Возвращённое значение когда 'ссылка' меньше"
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr "Макс"
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
-msgstr ""
+msgstr "Возвращённое значение когда 'ссылка' больше"
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
-msgstr ""
+msgstr "Значение узла, чтобы ограничить его диапазон"
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
-msgstr ""
+msgstr "Действительное значение для преобразования"
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
-msgstr ""
+msgstr "Значение узла, используемое для расчёта его обратной величины"
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
+"Значение, используемое для определения того, является ли \"ссылка\" слишком "
+"мала, чтобы получить её обратную"
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
-msgstr ""
+msgstr "Результирующее значение когда 'Ссылка' < 'Эпсилона'"
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
-msgstr ""
+msgstr "Эталонное значение"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
-msgstr ""
+msgstr "Исходный градиент для повтора"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
-msgstr ""
+msgstr "Количество"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
-msgstr ""
+msgstr "Число повторений градиента"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
+"Указывает насколько необъективным является исходный градиент в повторении "
+"[0,1]"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr "Укажите начало"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
+"Когда включено, \"Начальный цвет\" используется в качестве начала "
+"результирующего градиента"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr "Укажите конец"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
+"Когда включено, \"Конечный цвет\" используется в качестве начала "
+"результирующего градиента"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr "Начальная опорная точка"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
-msgstr ""
+msgstr "Используется в качестве начала результирующего градиента"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr "Конечная опорная точка"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
-msgstr ""
+msgstr "Используется в качестве конца результирующего градиента"
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+#, fuzzy
+msgid "The value to be reversed"
+msgstr "Действительное значение для преобразования"
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
-msgstr ""
+msgstr "Попытка получить инверсию необратимого значения узла"
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
-msgstr ""
+msgstr "Значение узла, используемое для масштабирования"
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
-msgstr ""
+msgstr "Значение, которое умножает значение узла"
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr "Сегмент"
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
-msgstr ""
+msgstr "Сегмент, где касательная связана"
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
-msgstr ""
+msgstr "Положение связанной касательной на сегменте (0,1]"
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
-msgstr ""
+msgstr "Сегмент, где вершина связана"
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
-msgstr ""
+msgstr "Положение связанной вершины на сегменте (0,1]"
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
-msgstr ""
+msgstr "Угол, из которого вычислен синус"
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
-msgstr ""
+msgstr "Значение, которое умножает результирующий синус"
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
-msgstr ""
+msgstr "Значение узла, используемое для создания шага"
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
-msgstr ""
+msgstr "Продолжительность шага"
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr "Время начала"
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
-msgstr ""
+msgstr "Время, когда начинается шаг преобразования"
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr "Пересечение"
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
-msgstr ""
+msgstr "Значение, которое определяет, будет ли шаг по центру на значении [0,1]"
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr "Цвет 1"
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
-msgstr ""
+msgstr "Один цвет полос градиента"
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr "Цвет 2"
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
-msgstr ""
+msgstr "Другой цвет полос градиента"
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
-msgstr ""
+msgstr "Количество полос"
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
-msgstr ""
+msgstr "Количество полос в градиенте"
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
-msgstr ""
+msgstr "Ширина полос в градиенте между [0,1]"
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
-msgstr ""
+msgstr "Левая сторона вычитания"
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
-msgstr ""
+msgstr "Правая сторона вычитания"
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
-msgstr ""
+msgstr "Значение, которое умножает вычитание"
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
-msgstr ""
+msgstr "Ссылка Выкл"
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
-msgstr ""
+msgstr "Значение узла, возвращаемое когда переключатель выключен"
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
-msgstr ""
+msgstr "Ссылка Вкл"
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
-msgstr ""
+msgstr "Значение узла, возвращаемое когда переключатель включен"
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
+"Когда включено, возвращается 'Ссылка Вкл', в противном случае возвращается "
+"'Ссылка Выкл'"
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
+"Значение узла, возвращаемое когда текущее время равно до 'время' - 'длина'"
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
-msgstr ""
+msgstr "Значение узла, возвращаемое когда текущее время равно после 'время'"
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr "Время"
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
-msgstr ""
+msgstr "Время, когда завершается линейная интерполяция"
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
+"Длина времени, когда линейная интерполяция выполнена между 'до' и 'после'"
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
-msgstr ""
+msgstr "Значение узла во временном цикле"
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
-msgstr ""
+msgstr "Время начала цикла для значения узла Линии времени"
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
-msgstr ""
+msgstr "Длина цикла"
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
-msgstr ""
+msgstr "Врямя, преобразованное в строку"
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr "Начальный цвет градиента"
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr "Конечный цвет градиента"
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr "Вектор"
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
-msgstr ""
+msgstr "Вектор, из которого вычислен угол"
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
-msgstr ""
+msgstr "Вектор, из которого вычислена длина"
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
-msgstr ""
+msgstr "Вектор, из которого извлечена координата X"
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
-msgstr ""
+msgstr "Вектор, из которого извлечена координата Y"
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
-msgstr ""
+msgstr "Средневзвешенное"
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
-msgstr ""
+msgstr "Точка ширины %03d"
 
 #: src/synfig/weightedvalue.h:77
 msgid "weighted"
-msgstr ""
+msgstr "взвешенный"
 
 #: src/tool/main.cpp:104
 msgid "FATAL: Synfig Version Mismatch"
@@ -4728,19 +4916,23 @@ msgstr "Фатальная ошибка: несовпадение версий S
 
 #: src/tool/main.cpp:143
 msgid "Settings"
-msgstr "Settings"
+msgstr "Настройки"
 
 #: src/tool/main.cpp:145
 msgid "Specify output target (Default: PNG)"
-msgstr ""
+msgstr "Указать цель вывода (по умолчанию PNG)"
 
 #: src/tool/main.cpp:146
 msgid "Set the image width in pixels (Use zero for file default)"
 msgstr ""
+"Задать ширину изображения в пикселях (используйте 0 для параметров по "
+"умолчанию)"
 
 #: src/tool/main.cpp:147
 msgid "Set the image height in pixels (Use zero for file default)"
 msgstr ""
+"Задать высоту изображения в пикселях (используйте 0 для параметров по "
+"умолчанию)"
 
 #: src/tool/main.cpp:148
 msgid "Set the diagonal size of image window (Span)"
@@ -4754,18 +4946,19 @@ msgstr "Задать силу сглаживания для параметрич
 #, c-format
 msgid "Specify image quality for accelerated renderer (Default: %d)"
 msgstr ""
+"Указать качество изображения для ускоренного отрисовщика (по умолчанию %d)"
 
 #: src/tool/main.cpp:151
 msgid "Gamma"
-msgstr "Gamma"
+msgstr "Гамма"
 
 #: src/tool/main.cpp:152
 msgid "Enable multithreaded renderer using the specified number of threads"
-msgstr ""
+msgstr "Использовать многопоточный отрисовщик с указанным количеством потоков"
 
 #: src/tool/main.cpp:153
 msgid "Specify input filename"
-msgstr ""
+msgstr "Указать имя входного файла"
 
 #: src/tool/main.cpp:154
 msgid "Specify output filename"
@@ -4776,6 +4969,8 @@ msgid ""
 "Output file sequence separator string (Use double quotes if you want to use "
 "spaces)"
 msgstr ""
+"Строка с последовательностью разделителей для выходного файла (используйте "
+"двойные кавычки, если вы хотите использовать пробелы)"
 
 #: src/tool/main.cpp:156
 msgid "Render the canvas with the given id instead of the root."
@@ -4799,23 +4994,23 @@ msgstr "Задать время конца"
 
 #: src/tool/main.cpp:162
 msgid "Set the physical resolution (Dots-per-inch)"
-msgstr ""
+msgstr "Задать физическое разрешение (в точках на дюйм)"
 
 #: src/tool/main.cpp:163
 msgid "Set the physical X resolution (Dots-per-inch)"
-msgstr ""
+msgstr "Задать физическое разрешение по X (в точках на дюйм)"
 
 #: src/tool/main.cpp:164
 msgid "Set the physical Y resolution (Dots-per-inch)"
-msgstr ""
+msgstr "Задать физическое разрешение по Y (в точках на дюйм)"
 
 #: src/tool/main.cpp:167
 msgid "Switch options"
-msgstr ""
+msgstr "Варианты переключателя"
 
 #: src/tool/main.cpp:169
 msgid "Output verbosity level"
-msgstr ""
+msgstr "Уровень детализации вывода"
 
 #: src/tool/main.cpp:170
 msgid "Quiet mode (No progress/time-remaining display)"
@@ -4823,15 +5018,15 @@ msgstr "Использовать менее подробный вывод (бе
 
 #: src/tool/main.cpp:171
 msgid "Print benchmarks"
-msgstr ""
+msgstr "Распечатать тест производительности"
 
 #: src/tool/main.cpp:172
 msgid "Extract alpha"
-msgstr ""
+msgstr "Извлечь альфа-канал"
 
 #: src/tool/main.cpp:175
 msgid "Misc options"
-msgstr ""
+msgstr "Разные опции"
 
 #: src/tool/main.cpp:177
 msgid "Append layers in <filename> to composition"
@@ -4843,27 +5038,27 @@ msgstr "Вывести указанные данные о корневом хо
 
 #: src/tool/main.cpp:179 src/tool/main.cpp:205
 msgid "Print out the list of exported canvases in the composition"
-msgstr ""
+msgstr "Вывести список экспортированных в композицию холстов"
 
 #: src/tool/main.cpp:182
 msgid "FFMPEG target options"
-msgstr ""
+msgstr "Опции цели FFMPEG"
 
 #: src/tool/main.cpp:184
 msgid "Set the codec for the video. See --ffmpeg-video-codecs"
-msgstr ""
+msgstr "Установить кодек для видео. Смотрите --ffmpeg-video-codecs"
 
 #: src/tool/main.cpp:185
 msgid "Set the bitrate for the output video"
-msgstr ""
+msgstr "Установить битрейт для выходного видео"
 
 #: src/tool/main.cpp:188
 msgid "Synfig info options"
-msgstr ""
+msgstr "Опции информации Synfig"
 
 #: src/tool/main.cpp:190
 msgid "Produce this help message"
-msgstr ""
+msgstr "Создавать это справочное сообщение"
 
 #: src/tool/main.cpp:191
 msgid "Print out the list of available importers"
@@ -4896,11 +5091,11 @@ msgstr "Вывести список доступных целей"
 #: src/tool/main.cpp:198
 msgid ""
 "Print out the list of available video codecs when encoding through FFMPEG"
-msgstr ""
+msgstr "Вывести список доступных видео кодеков при кодировании через FFMPEG"
 
 #: src/tool/main.cpp:199
 msgid "Print out the list of available ValueNodes"
-msgstr ""
+msgstr "Вывести список доступных значений узлов"
 
 #: src/tool/main.cpp:200
 msgid "Print out version information"
@@ -4908,44 +5103,44 @@ msgstr "Вывести информацию о версии"
 
 #: src/tool/main.cpp:209
 msgid "Synfig debug flags"
-msgstr ""
+msgstr "Флаги отладки Synfig"
 
 #: src/tool/main.cpp:211
 msgid "Test GUID generation"
-msgstr ""
+msgstr "Протестировать генерацию GUID"
 
 #: src/tool/main.cpp:212
 msgid "Test signal implementation"
-msgstr ""
+msgstr "Протестировать реализацию сигнала"
 
 #: src/tool/main.cpp:247
 msgid "Try 'synfig --help' for more information"
-msgstr ""
+msgstr "Попробуйте 'synfig --help' для большей информации"
 
 #: src/tool/joblistprocessor.cpp:73
 msgid "Nothing to do!"
-msgstr ""
+msgstr "Нечего делать!"
 
 #: src/tool/joblistprocessor.cpp:84
 msgid "Attempting to determine target/outfile..."
-msgstr ""
+msgstr "Попытка определить цель/выходной файл..."
 
 #: src/tool/joblistprocessor.cpp:90
 msgid "Target name undefined, attempting to figure it out"
-msgstr ""
+msgstr "Имя цели определено, попытка понять его"
 
 #: src/tool/joblistprocessor.cpp:120
 msgid "Defaulting to PNG target..."
-msgstr ""
+msgstr "Установление цели PNG по умолчанию..."
 
 #: src/tool/joblistprocessor.cpp:145
 #, c-format
 msgid "Unable to create output for \"%s\": %s"
-msgstr ""
+msgstr "Невозможно создать вывод для \"%s\": %s"
 
 #: src/tool/joblistprocessor.cpp:148 src/tool/joblistprocessor.cpp:168
 msgid "Throwing out job..."
-msgstr ""
+msgstr "Отбрасывание работы..."
 
 #: src/tool/joblistprocessor.cpp:152
 msgid "Creating the target..."
@@ -4954,7 +5149,7 @@ msgstr "Создаётся цель..."
 #: src/tool/joblistprocessor.cpp:165
 #, c-format
 msgid "Unknown target for \"%s\": %s"
-msgstr ""
+msgstr "Неизвестная цель для \"%s\": %s"
 
 #: src/tool/joblistprocessor.cpp:178
 msgid "Setting the canvas on the target..."
@@ -4966,27 +5161,27 @@ msgstr "Задаётся качество цели..."
 
 #: src/tool/joblistprocessor.cpp:186
 msgid "Setting the alpha mode of the target..."
-msgstr ""
+msgstr "Установка режима альфа-канала цели..."
 
 #: src/tool/joblistprocessor.cpp:228 src/tool/joblistprocessor.cpp:238
 msgid "Render Failure."
-msgstr ""
+msgstr "Не удалось визуализировать."
 
 #: src/tool/joblistprocessor.cpp:232
 msgid "Rendering..."
-msgstr "Rendering..."
+msgstr "Визуализация..."
 
 #: src/tool/joblistprocessor.cpp:246
 msgid ": Rendered in "
-msgstr ""
+msgstr ": Визуализировано за"
 
 #: src/tool/joblistprocessor.cpp:248
 msgid " seconds."
-msgstr ""
+msgstr "секунд."
 
 #: src/tool/joblistprocessor.cpp:252
 msgid "Done."
-msgstr "Done."
+msgstr "Готово."
 
 #: src/tool/optionsprocessor.cpp:138
 msgid "Unrecognised canvas variable: "
@@ -4998,58 +5193,58 @@ msgstr "Распознанные переменные:"
 
 #: src/tool/optionsprocessor.cpp:156
 msgid "verbosity set to "
-msgstr ""
+msgstr "детализация установлена на"
 
 #: src/tool/optionsprocessor.cpp:176
 msgid "Threads set to "
-msgstr ""
+msgstr "Количество потоков установлено на"
 
 #: src/tool/optionsprocessor.cpp:255
 msgid "Layer Name: "
-msgstr ""
+msgstr "Название слоя:"
 
 #: src/tool/optionsprocessor.cpp:256
 msgid "Localized Layer Name: "
-msgstr ""
+msgstr "Имя локализованного слоя:"
 
 #: src/tool/optionsprocessor.cpp:258
 msgid "Version: "
-msgstr ""
+msgstr "Версия: "
 
 #: src/tool/optionsprocessor.cpp:263
 msgid "param - "
-msgstr ""
+msgstr "параметр -"
 
 #: src/tool/optionsprocessor.cpp:265
 msgid " (not critical)"
-msgstr ""
+msgstr "(не критично)"
 
 #: src/tool/optionsprocessor.cpp:266
 msgid "\tLocalized Name: "
-msgstr ""
+msgstr "\tЛокализованное имя: "
 
 #: src/tool/optionsprocessor.cpp:270
 msgid "\tDescription: "
-msgstr ""
+msgstr "\tОписание: "
 
 #: src/tool/optionsprocessor.cpp:274
 msgid "\tHint: "
-msgstr ""
+msgstr "\tПодсказка: "
 
 #: src/tool/optionsprocessor.cpp:340
 #, c-format
 msgid "Antialiasing set to %d, (%d samples per pixel)"
-msgstr ""
+msgstr "Сглашивание установлено на %d, (%d сэмплов на пиксель)"
 
 #: src/tool/optionsprocessor.cpp:347
 #, c-format
 msgid "Span set to %d units"
-msgstr ""
+msgstr "Интервал установлен на %d единиц"
 
 #: src/tool/optionsprocessor.cpp:355
 #, c-format
 msgid "Frame rate set to %d frames per second"
-msgstr ""
+msgstr "Частота кадров установлена на %d кадров в секунду"
 
 #: src/tool/optionsprocessor.cpp:365
 #, c-format
@@ -5068,50 +5263,52 @@ msgstr "Физическое разрешение по Y указано равн
 
 #: src/tool/optionsprocessor.cpp:406
 msgid "Rendering frame at "
-msgstr ""
+msgstr "Визуализация  кадра"
 
 #: src/tool/optionsprocessor.cpp:412
 msgid "Gamma argument is currently ignored"
-msgstr ""
+msgstr "Гамма аргумент в настоящее время игнорируются"
 
 #: src/tool/optionsprocessor.cpp:427
 #, c-format
 msgid "Resolution set to %dx%d."
-msgstr ""
+msgstr "Разрешение установлено на %dx%d."
 
 #: src/tool/optionsprocessor.cpp:444
 msgid "Both video codec and bitrate parameters are necessary."
-msgstr ""
+msgstr "Необходимы оба параметра: видео кодек и битрейт."
 
 #: src/tool/optionsprocessor.cpp:470
 #, c-format
 msgid "Video codec \"%s\" is not supported."
-msgstr ""
+msgstr "Видео кодек \"%s\" не поддерживается."
 
 #: src/tool/optionsprocessor.cpp:474
 msgid "Target video codec set to: "
-msgstr ""
+msgstr "Цель видео кодека установлена на:"
 
 #: src/tool/optionsprocessor.cpp:480
 msgid "Target bitrate set to: "
-msgstr ""
+msgstr "Цель битрейта установлена на:"
 
 #: src/tool/optionsprocessor.cpp:486
 msgid "Output file sequence separator set to: '"
 msgstr ""
+"Строка с последовательностью разделителей для выходного файла установлена "
+"на: '"
 
 #: src/tool/optionsprocessor.cpp:538
 #, c-format
 msgid "Unable to load file '%s'."
-msgstr ""
+msgstr "Не удалось загрузить файл '%s'."
 
 #: src/tool/optionsprocessor.cpp:546
 msgid "No input file provided."
-msgstr ""
+msgstr "Не указано имя входного файла."
 
 #: src/tool/optionsprocessor.cpp:552
 msgid "Target set to "
-msgstr ""
+msgstr "Цель установлена на"
 
 #: src/tool/optionsprocessor.cpp:571
 msgid "Quality set to "
@@ -5123,6 +5320,8 @@ msgid ""
 "Unable to find canvas with ID \"%s\" in %s.\n"
 "Throwing out job..."
 msgstr ""
+"Невозможно найти холст с идентификатором \"%s\" в %s.\n"
+"Отбрасывание работы..."
 
 #: src/tool/optionsprocessor.cpp:597
 #, c-format
@@ -5130,6 +5329,8 @@ msgid ""
 "Invalid canvas name \"%s\" in %s.\n"
 "Throwing out job..."
 msgstr ""
+"Некорректное имя холста \"%s\" в %s.\n"
+"Отбрасывание работы..."
 
 #: src/tool/optionsprocessor.cpp:634
 msgid "Unable to append '"
@@ -5149,7 +5350,7 @@ msgstr "Частота кадров"
 
 #: src/tool/printing_functions.cpp:92
 msgid "Start Frame"
-msgstr "Кадра начала"
+msgstr "Кадр начала"
 
 #: src/tool/printing_functions.cpp:99
 msgid "End Frame"
@@ -5197,19 +5398,19 @@ msgstr "Разрешение по Y"
 
 #: src/tool/printing_functions.cpp:195
 msgid "Diagonal Image Span"
-msgstr ""
+msgstr "Интервал диагонального изображения"
 
 #: src/tool/printing_functions.cpp:204
 msgid "Interlaced"
-msgstr ""
+msgstr "Чередуемый"
 
 #: src/tool/printing_functions.cpp:211
 msgid "Antialias"
-msgstr ""
+msgstr "Сглаживание"
 
 #: src/tool/printing_functions.cpp:225
 msgid "Flags"
-msgstr ""
+msgstr "Флаги"
 
 #: src/tool/printing_functions.cpp:232
 msgid "Focus"
diff --git a/po/si.gmo b/po/si.gmo
index 38aafce..c1f710b 100644
Binary files a/po/si.gmo and b/po/si.gmo differ
diff --git a/po/si.po b/po/si.po
index 1d589e0..4322161 100644
--- a/po/si.po
+++ b/po/si.po
@@ -7,10 +7,10 @@
 # bjuuhuiujol <mpolkotuwa at gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Sinhala (http://www.transifex.com/projects/p/synfig/language/"
 "si/)\n"
@@ -29,8 +29,9 @@ msgstr ""
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr ""
 
@@ -56,8 +57,9 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "පාට"
 
@@ -75,7 +77,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr ""
 
@@ -88,7 +90,7 @@ msgid "Italic"
 msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr ""
 
@@ -158,9 +160,12 @@ msgstr ""
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr ""
 
@@ -194,7 +199,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr ""
 
@@ -239,27 +244,27 @@ msgid "Type of blur to use"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr ""
 
@@ -346,6 +351,7 @@ msgstr ""
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr ""
 
@@ -356,13 +362,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr ""
 
@@ -420,7 +427,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr ""
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr ""
 
@@ -428,7 +435,8 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr ""
 
@@ -595,7 +603,8 @@ msgstr ""
 msgid "Scale Outside"
 msgstr ""
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr ""
 
@@ -612,12 +621,13 @@ msgstr ""
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr ""
 
@@ -639,7 +649,7 @@ msgid "Spherize"
 msgstr ""
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr ""
 
@@ -654,7 +664,7 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr ""
 
@@ -758,12 +768,13 @@ msgstr ""
 msgid "Avoid alpha artifacts when checked"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr ""
 
@@ -771,16 +782,19 @@ msgstr ""
 msgid "Start time of the loop for the cycled context"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr ""
 
@@ -804,7 +818,8 @@ msgstr ""
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr ""
 
@@ -913,11 +928,12 @@ msgstr ""
 msgid "Size of the pattern"
 msgstr ""
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr ""
 
@@ -1007,13 +1023,14 @@ msgstr "උදාහරණ"
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr ""
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr ""
 
@@ -1025,6 +1042,7 @@ msgstr ""
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr ""
 
@@ -1064,9 +1082,9 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr ""
 
@@ -1130,7 +1148,7 @@ msgid "Blur"
 msgstr ""
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr ""
 
@@ -1158,7 +1176,8 @@ msgstr ""
 msgid "Exposure Adjust"
 msgstr ""
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr ""
 
@@ -1258,7 +1277,8 @@ msgstr ""
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr ""
 
@@ -1304,37 +1324,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr ""
 
@@ -1368,14 +1388,14 @@ msgid "Smoothness"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr ""
 
@@ -1443,7 +1463,8 @@ msgstr ""
 msgid "Radius of the circle"
 msgstr ""
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr ""
 
@@ -1466,8 +1487,9 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr ""
 
@@ -1486,7 +1508,7 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr ""
 
@@ -1566,9 +1588,11 @@ msgstr ""
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr ""
 
@@ -1654,10 +1678,10 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr ""
 
@@ -1800,32 +1824,32 @@ msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr ""
 
@@ -1883,13 +1907,20 @@ msgid "When checked the gradient is supersampled"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr ""
 
@@ -1911,6 +1942,7 @@ msgid "Seeds the random number generator"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr ""
 
@@ -1995,8 +2027,9 @@ msgid ""
 "size, and an alpha of 1.0 is used when rendering"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr ""
 
@@ -2004,8 +2037,9 @@ msgstr ""
 msgid "If enabled, render the plant in the opposite direction"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr ""
 
@@ -2216,7 +2250,7 @@ msgstr ""
 msgid "Importer::open(): Unknown file type -- "
 msgstr ""
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr ""
 
@@ -2228,251 +2262,292 @@ msgstr ""
 msgid "Modifies the position of the layer in the layer stack"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr ""
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+msgid "First corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+msgid "Second corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+msgid "Horizontal subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:51
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2768,7 +2843,7 @@ msgstr ""
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr ""
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr ""
 
@@ -2970,8 +3045,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr ""
 
@@ -3011,13 +3086,13 @@ msgstr ""
 msgid "Divide"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr ""
 
@@ -3033,12 +3108,14 @@ msgstr ""
 msgid "Darken"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr ""
 
@@ -3152,230 +3229,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr ""
 
@@ -3384,1319 +3491,1355 @@ msgstr ""
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+msgid "The value to be reversed"
+msgstr ""
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/sk_SK.gmo b/po/sk_SK.gmo
index 1f63a30..fdbb353 100644
Binary files a/po/sk_SK.gmo and b/po/sk_SK.gmo differ
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 403b108..944f920 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the Synfig Core package.
 #
 # Translators:
+# hualahyja, 2015
 # Marek Lach <marek.brohatwack.lach at gmail.com>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/synfig/"
 "language/sk_SK/)\n"
@@ -28,8 +29,9 @@ msgstr "Text"
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "Ostatné/Iné"
 
@@ -55,8 +57,9 @@ msgstr "Text na renderovanie"
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "Farba"
 
@@ -74,38 +77,38 @@ msgstr "Štýl"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr "Normálne"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:588
 msgid "Oblique"
-msgstr ""
+msgstr "Naklonené"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:589
 msgid "Italic"
-msgstr "Krivé"
+msgstr "Kurzíva"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr "Váha"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:595
 msgid "Ultralight"
-msgstr "Veľmi ľahké"
+msgstr "Ultraľahké"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:596
 msgid "light"
-msgstr "svetlo"
+msgstr "Ľahké"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:598
 msgid "Bold"
-msgstr "Hrubé"
+msgstr "Tučné"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:599
 msgid "Ultrabold"
-msgstr "Veľmi hrubé"
+msgstr "Ultratučné"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:600
 msgid "Heavy"
@@ -134,11 +137,11 @@ msgstr "Popisuje ako blízko sú riadky textu zvisle"
 #: src/modules/mod_geometry/checkerboard.cpp:154
 #: src/modules/mod_noise/distort.cpp:227 src/modules/mod_noise/noise.cpp:276
 msgid "Size"
-msgstr "Veľkosť"
+msgstr "Stupeň"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:614
 msgid "Size of the text"
-msgstr "Veľkosť textu"
+msgstr "Výška písma"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:621
 msgid "Orientation"
@@ -157,9 +160,12 @@ msgstr "Orientácia textu"
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr "Pôvod"
 
@@ -193,7 +199,7 @@ msgstr "Toto vypnite ak idete animovať text"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr "Obráť"
 
@@ -238,27 +244,27 @@ msgid "Type of blur to use"
 msgstr "Typ rozmazania, ktorý použiť"
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr ""
 
@@ -345,6 +351,7 @@ msgstr ""
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr ""
 
@@ -355,13 +362,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr ""
 
@@ -371,7 +379,7 @@ msgstr ""
 
 #: src/modules/lyr_std/curvewarp.cpp:407
 msgid "Start Point"
-msgstr ""
+msgstr "Počiatočný bod"
 
 #: src/modules/lyr_std/curvewarp.cpp:409
 msgid "First point of the source line"
@@ -379,7 +387,7 @@ msgstr ""
 
 #: src/modules/lyr_std/curvewarp.cpp:412
 msgid "End Point"
-msgstr ""
+msgstr "Koncový bod"
 
 #: src/modules/lyr_std/curvewarp.cpp:413
 msgid "Final point of the source line"
@@ -392,7 +400,7 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:559
 #: src/modules/mod_particle/plant.cpp:424
 msgid "Vertices"
-msgstr ""
+msgstr "Vrcholy"
 
 #: src/modules/lyr_std/curvewarp.cpp:419
 msgid "List of Spline Points where the source line is curved to"
@@ -419,7 +427,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr ""
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr ""
 
@@ -427,9 +435,10 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
-msgstr ""
+msgstr "Časový posun"
 
 #: src/modules/lyr_std/import.cpp:323
 msgid "Time Offset to apply to the imported file"
@@ -594,7 +603,8 @@ msgstr ""
 msgid "Scale Outside"
 msgstr ""
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr ""
 
@@ -611,12 +621,13 @@ msgstr ""
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr "Hodnota"
 
@@ -638,7 +649,7 @@ msgid "Spherize"
 msgstr ""
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr ""
 
@@ -653,7 +664,7 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr "Polomer"
 
@@ -757,12 +768,13 @@ msgstr ""
 msgid "Avoid alpha artifacts when checked"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr ""
 
@@ -770,16 +782,19 @@ msgstr ""
 msgid "Start time of the loop for the cycled context"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr ""
 
@@ -803,7 +818,8 @@ msgstr ""
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr ""
 
@@ -912,11 +928,12 @@ msgstr ""
 msgid "Size of the pattern"
 msgstr ""
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr ""
 
@@ -1006,13 +1023,14 @@ msgstr "Príklad"
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr "Vyplň farbu vrstvy"
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr "Bod 1"
 
@@ -1024,6 +1042,7 @@ msgstr "Prvý kút obdlžníka"
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr "Bod 2"
 
@@ -1063,9 +1082,9 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr "Farebný prechod"
 
@@ -1129,7 +1148,7 @@ msgid "Blur"
 msgstr ""
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr ""
 
@@ -1157,7 +1176,8 @@ msgstr ""
 msgid "Exposure Adjust"
 msgstr ""
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr ""
 
@@ -1257,7 +1277,8 @@ msgstr ""
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr ""
 
@@ -1303,37 +1324,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr ""
 
@@ -1364,17 +1385,17 @@ msgstr "Zaguľatené"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1175
 msgid "Smoothness"
-msgstr ""
+msgstr "Miera vyhladenia"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr ""
 
@@ -1442,7 +1463,8 @@ msgstr ""
 msgid "Radius of the circle"
 msgstr ""
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr "Rozmazanie"
 
@@ -1465,8 +1487,9 @@ msgstr "Definuje pokles funkcie rozmazania"
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr "Lineárna"
 
@@ -1485,7 +1508,7 @@ msgstr "Esovitá"
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr "kosínus"
 
@@ -1565,9 +1588,11 @@ msgstr ""
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr "Uhol"
 
@@ -1653,10 +1678,10 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr "Slučka"
 
@@ -1799,32 +1824,32 @@ msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr "Interpolácia"
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr ""
 
@@ -1855,7 +1880,7 @@ msgstr ""
 #: src/modules/mod_noise/main.cpp:66
 #: src/modules/mod_noise/valuenode_random.cpp:169
 msgid "Random"
-msgstr ""
+msgstr "Náhodne"
 
 #: src/modules/mod_noise/noise.cpp:58
 msgid "Noise Gradient"
@@ -1882,13 +1907,20 @@ msgid "When checked the gradient is supersampled"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr "Prepoj"
 
@@ -1910,6 +1942,7 @@ msgid "Seeds the random number generator"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr ""
 
@@ -1994,8 +2027,9 @@ msgid ""
 "size, and an alpha of 1.0 is used when rendering"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr ""
 
@@ -2003,8 +2037,9 @@ msgstr ""
 msgid "If enabled, render the plant in the opposite direction"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr ""
 
@@ -2215,7 +2250,7 @@ msgstr ""
 msgid "Importer::open(): Unknown file type -- "
 msgstr ""
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr ""
 
@@ -2227,253 +2262,294 @@ msgstr "Hĺbka Z"
 msgid "Modifies the position of the layer in the layer stack"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr "Spôsob zmiešania"
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr "Duplikuj"
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr "Index"
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr ""
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr "Konštantne"
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr "Plátno"
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr "Meno"
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
-msgid "Solid Color"
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:51
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
 #, fuzzy
-msgid "Sound"
-msgstr "Zaguľatené"
+msgid "First corner of the bounds rectangle"
+msgstr "Prvý kút obdlžníka"
 
-#: src/synfig/layer_sound.cpp:102
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
 #, fuzzy
+msgid "Second corner of the bounds rectangle"
+msgstr "Druhý kút obdlžníka"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+msgid "Horizontal subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
+msgid "Solid Color"
+msgstr ""
+
+#: src/synfig/layers/layer_sound.cpp:51
+msgid "Sound"
+msgstr ""
+
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
-msgstr "Nedá sa otvoriť súbor"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2769,7 +2845,7 @@ msgstr ""
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr ""
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr "Uzol hodnôt"
 
@@ -2971,8 +3047,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr ""
 
@@ -2994,7 +3070,7 @@ msgstr ""
 
 #: src/synfig/paramdesc.cpp:73
 msgid "Screen"
-msgstr ""
+msgstr "Obrazovka"
 
 #: src/synfig/paramdesc.cpp:74
 msgid "Overlay"
@@ -3012,13 +3088,13 @@ msgstr ""
 msgid "Divide"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr ""
 
@@ -3034,12 +3110,14 @@ msgstr ""
 msgid "Darken"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr "Odtieň"
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr "Sýtosť"
 
@@ -3153,230 +3231,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr "Referencie"
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr "Celé číslo"
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr "Reálny"
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr ""
 
@@ -3385,1319 +3493,1355 @@ msgstr ""
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr "X"
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr "Červená"
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr "Zelená"
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr "Modrá"
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr "Alfa"
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr "Vlož"
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr "Dĺžka"
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr "Hodnota"
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr "Svetlosť"
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+msgid "The value to be reversed"
+msgstr ""
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr "Segment"
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr "Čas"
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr "Vektor"
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/sr_RS.gmo b/po/sr_RS.gmo
index 875ea55..2867f88 100644
Binary files a/po/sr_RS.gmo and b/po/sr_RS.gmo differ
diff --git a/po/sr_RS.po b/po/sr_RS.po
index c6deca0..d756684 100644
--- a/po/sr_RS.po
+++ b/po/sr_RS.po
@@ -6,10 +6,10 @@
 # Jay Alexander Fleming <tito.nehru.naser at gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Serbian (Serbia) (http://www.transifex.com/projects/p/synfig/"
 "language/sr_RS/)\n"
@@ -29,8 +29,9 @@ msgstr "Текст"
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "Остало"
 
@@ -56,8 +57,9 @@ msgstr "Текст за стварање"
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "Боја"
 
@@ -75,7 +77,7 @@ msgstr "Облик"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr "Обично"
 
@@ -88,7 +90,7 @@ msgid "Italic"
 msgstr "Косо"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr "Дебљина"
 
@@ -158,9 +160,12 @@ msgstr "Усмерење текста"
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr "Координате"
 
@@ -194,7 +199,7 @@ msgstr "Онемогућите ово уколико желите да аним
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr "Преокрени"
 
@@ -239,27 +244,27 @@ msgid "Type of blur to use"
 msgstr "Врста употребљеног замућења"
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr "Бокс замућење"
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr "Брзо гаусово замућење"
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr "Укрштеним линијама замућење"
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr "Гаусово замућење"
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr "Диск замућење"
 
@@ -346,6 +351,7 @@ msgstr "Изобличење кривом"
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr "Изобличавања"
 
@@ -356,13 +362,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr "Ширина"
 
@@ -420,7 +427,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr "Датотека је већ названа као „%s“ (%s)"
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr "Назив датотеке"
 
@@ -428,7 +435,8 @@ msgstr "Назив датотеке"
 msgid "File to import"
 msgstr "Датотека за увоз"
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr "Временски померај"
 
@@ -595,7 +603,8 @@ msgstr "Гранање споља"
 msgid "Scale Outside"
 msgstr "Величање споља"
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr "Врти"
 
@@ -612,12 +621,13 @@ msgstr "Одређује где ће координате да буду"
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr "Количина"
 
@@ -639,7 +649,7 @@ msgid "Spherize"
 msgstr "Испупчи"
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr "Положај"
 
@@ -654,7 +664,7 @@ msgstr "Одређује где ће координате средишта ис
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr "Пречник"
 
@@ -758,12 +768,13 @@ msgstr ""
 msgid "Avoid alpha artifacts when checked"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr "Врем. понављање"
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr ""
 
@@ -771,16 +782,19 @@ msgstr ""
 msgid "Start time of the loop for the cycled context"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr "Трајање"
 
@@ -804,7 +818,8 @@ msgstr ""
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr "Преводи"
 
@@ -913,11 +928,12 @@ msgstr "Средиште шаблона"
 msgid "Size of the pattern"
 msgstr "Величина шаблона"
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr "Промени димензије"
 
@@ -1007,13 +1023,14 @@ msgstr "Пример"
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr "Боја испуне слоја"
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr "1. тачка"
 
@@ -1025,6 +1042,7 @@ msgstr "Горња-Лева тачка правоугаоника"
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr "2. тачка"
 
@@ -1064,9 +1082,9 @@ msgstr "Повезанe лопте"
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr "Прелив"
 
@@ -1130,7 +1148,7 @@ msgid "Blur"
 msgstr "Замућење"
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr "Замућења"
 
@@ -1158,7 +1176,8 @@ msgstr "Изражајност"
 msgid "Exposure Adjust"
 msgstr ""
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr "Прилагођење гамута"
 
@@ -1258,7 +1277,8 @@ msgstr "Прецизна контура"
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr "Геометријски облици"
 
@@ -1304,37 +1324,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr ""
 
@@ -1368,14 +1388,14 @@ msgid "Smoothness"
 msgstr "Течност стила"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr ""
 
@@ -1443,7 +1463,8 @@ msgstr "Круг"
 msgid "Radius of the circle"
 msgstr "Пречник круга"
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr "Изблеђивање"
 
@@ -1466,8 +1487,9 @@ msgstr "Утврђује функцију опадања употребљену
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr "Равномерно"
 
@@ -1486,7 +1508,7 @@ msgstr "Зигмонд"
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr "Косинусно"
 
@@ -1566,9 +1588,11 @@ msgstr ""
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr "Угао"
 
@@ -1654,10 +1678,10 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr "Понављање"
 
@@ -1800,32 +1824,32 @@ msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr "Уметање"
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr "СП-крива"
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr "Кубно"
 
@@ -1883,13 +1907,20 @@ msgid "When checked the gradient is supersampled"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr "Повежи"
 
@@ -1911,6 +1942,7 @@ msgid "Seeds the random number generator"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr "Брзина"
 
@@ -1995,8 +2027,9 @@ msgid ""
 "size, and an alpha of 1.0 is used when rendering"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr ""
 
@@ -2004,8 +2037,9 @@ msgstr ""
 msgid "If enabled, render the plant in the opposite direction"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr "Корак"
 
@@ -2216,7 +2250,7 @@ msgstr ""
 msgid "Importer::open(): Unknown file type -- "
 msgstr ""
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr ""
 
@@ -2228,253 +2262,295 @@ msgstr "Дубина слоја"
 msgid "Modifies the position of the layer in the layer stack"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr "Горе лево"
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr "Доле десно"
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr "Провидност слоја (алфа канал)"
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr "Начин спајања"
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr "Удвостручи"
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr "Попис"
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr ""
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr "Замућење покрета"
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr "Константно"
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr "Претварање"
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr "Положај, вртња, нагиб и димензије"
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr "Платно"
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr "Садржај у свежњу"
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr "Ако је означено, спречава одабир подређених објеката кликом"
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr "Прираст контуре"
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr "Експоненцијална вредност прираста ширине подређеног слоја контуре"
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr "Тренутно време"
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr "Многоугао"
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr "Списак везица"
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr "Одређује темена многоугла"
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr "Облик"
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr "Унутрашњи"
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr "Умекшај ивице"
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr "Врста изблеђивања"
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr "Употреби врсту изблеђивања"
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr "Облик завијања"
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr "Употребљавани облик завијања"
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr "Скелет"
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr "Назив"
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr "Коске"
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+#, fuzzy
+msgid "First corner of the bounds rectangle"
+msgstr "Горња-Лева тачка правоугаоника"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+#, fuzzy
+msgid "Second corner of the bounds rectangle"
+msgstr "Доња-Десна тачка правоугаоника"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+#, fuzzy
+msgid "Horizontal subdivisions"
+msgstr "Међусловни размак"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr "Једнобојно"
 
-#: src/synfig/layer_sound.cpp:51
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
-msgstr "Заобљено"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
-msgstr "Не могу да отворим датотеку"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr "Скретница"
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr "Назив радног слоја"
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr "Видљиви су само слојеви са одређеним називом"
 
@@ -2770,7 +2846,7 @@ msgstr "Ентитет „творац“ је празан"
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr "Платно „%s“ нема одређено %s: %s"
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr "Чвор-вредности"
 
@@ -2972,8 +3048,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr "Мешањем"
 
@@ -3013,13 +3089,13 @@ msgstr "РГБ-Множено"
 msgid "Divide"
 msgstr "Дељено"
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr "РГБ-Збрајано"
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr "РГБ-Разликовано"
 
@@ -3035,12 +3111,14 @@ msgstr "ПоредиРГБ-Осветљено"
 msgid "Darken"
 msgstr "ПоредиРГБ-Затамњено"
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr "Нијанса"
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr "Засићеност"
 
@@ -3154,230 +3232,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr "Референце"
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr "Цео број"
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr "Вектор Ш"
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr "Вектор В"
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr "Реалан број"
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr "и"
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr ""
 
@@ -3386,1319 +3494,1355 @@ msgstr ""
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr "И"
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr "Реф.Тачка већ постоји на овој временској тачки"
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr "%s: Не можете да употребљавате %s у анимираном Чвору-вредности"
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr "Анимирано"
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr "Померај"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr "Дубина слоја"
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr "Лоша врста за мешање"
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr "Црвена"
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr "Зелена"
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr "Плава"
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr "Провидност"
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr "Трајање"
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr "Вредност"
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr "Вредност"
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr "Од"
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr "Почетна вредност пописа"
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr "До"
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr "Завршна вредност пописа"
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr "Осветљеност"
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+msgid "The value to be reversed"
+msgstr ""
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr "Делић"
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr "Почетак"
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr "1. боја"
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr "2. боја"
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr "У прекиду"
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr "Враћена вредност скретнице када не ради"
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr "Повезано"
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr "Враћена вредност скретнице када ради"
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr "Ако је означено, враћа „Повезано“, у супротном „У прекиду“"
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr "Време"
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr "Вектор"
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/sv_SE.gmo b/po/sv_SE.gmo
index e1108ac..9d5f640 100644
Binary files a/po/sv_SE.gmo and b/po/sv_SE.gmo differ
diff --git a/po/sv_SE.po b/po/sv_SE.po
index c743b19..a5b30dc 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -6,10 +6,10 @@
 # Benjamin Larsson <mafortion.benjamin at gmail.com>, 2013-2014
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/synfig/"
 "language/sv_SE/)\n"
@@ -28,8 +28,9 @@ msgstr "Text"
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "Övriga"
 
@@ -55,8 +56,9 @@ msgstr "Text att Rendera"
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "Färg"
 
@@ -74,7 +76,7 @@ msgstr "Stil"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr "Normal"
 
@@ -87,7 +89,7 @@ msgid "Italic"
 msgstr "Kursiv"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr "Tjocklek"
 
@@ -157,9 +159,12 @@ msgstr "Textens orientering"
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr "Utgångspunkt"
 
@@ -193,7 +198,7 @@ msgstr "Slå av detta om du ska animera texten"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr "Invertera"
 
@@ -238,27 +243,27 @@ msgid "Type of blur to use"
 msgstr "Typ av oskärpa att använda"
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr "Box-oskärpa"
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr "Snabb gaussisk oskärpa"
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr "Korsskuggnings-oskärpa"
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr "Gaussisk oskärpa"
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr "Disk-oskärpa"
 
@@ -345,6 +350,7 @@ msgstr "Kurv-förvridning"
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr "Förvrängning"
 
@@ -355,13 +361,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr "Bredd"
 
@@ -419,7 +426,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr "Filnamnet ser ut att redan vara inställt på \"%s\" (%s)"
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr "Filnamn"
 
@@ -427,7 +434,8 @@ msgstr "Filnamn"
 msgid "File to import"
 msgstr "Fil att importera"
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr "Tidsförskjutning"
 
@@ -594,7 +602,8 @@ msgstr "Förskjutning utsida"
 msgid "Scale Outside"
 msgstr "Storlek utsida"
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr "Rotera"
 
@@ -611,12 +620,13 @@ msgstr "Peka där du vill att utgångspunkten ska vara"
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr "Kvantitet"
 
@@ -638,7 +648,7 @@ msgid "Spherize"
 msgstr "Sfärifisera"
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr "Position"
 
@@ -653,7 +663,7 @@ msgstr "Var sfär-förvrängningen ska vara centrerad"
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr "Radie"
 
@@ -759,12 +769,13 @@ msgstr "Var alfa-säker"
 msgid "Avoid alpha artifacts when checked"
 msgstr "Alfa-artefakter undviks när detta alternativ är påslaget"
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr "Tids-slinga"
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr "Länka tid"
 
@@ -772,16 +783,19 @@ msgstr "Länka tid"
 msgid "Start time of the loop for the cycled context"
 msgstr "Start time of the loop for the cycled context"
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr "Lokal tid"
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr "Tiden när den resulterande slingan startar"
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr "Varaktighet"
 
@@ -805,7 +819,8 @@ msgstr "Symmetrisk"
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr "När detta är på, kommer slingor speglas med mitt på lokal tid"
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr "Översätt"
 
@@ -914,11 +929,12 @@ msgstr "Mönstrets mitt"
 msgid "Size of the pattern"
 msgstr "Storlek på mönstret"
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr "Skala"
 
@@ -1008,13 +1024,14 @@ msgstr "Exempel"
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr "Fyllnadsfärg för lagret"
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr "Punkt 1"
 
@@ -1026,6 +1043,7 @@ msgstr "Första hörnet i rektangeln"
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr "Punkt 2"
 
@@ -1065,9 +1083,9 @@ msgstr "Metaballs"
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr "Gradient"
 
@@ -1131,7 +1149,7 @@ msgid "Blur"
 msgstr "Oskärpa"
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr "Oskärpor"
 
@@ -1159,7 +1177,8 @@ msgstr "Kontrast"
 msgid "Exposure Adjust"
 msgstr "Exponerings-justering"
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr "Gamma-justering"
 
@@ -1259,7 +1278,8 @@ msgstr "Avancerad kontur"
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr "Geometri"
 
@@ -1305,37 +1325,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr ""
 
@@ -1369,14 +1389,14 @@ msgid "Smoothness"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr "Enhetlig"
 
@@ -1444,7 +1464,8 @@ msgstr "Cirkel"
 msgid "Radius of the circle"
 msgstr "Cirkelns radie"
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr "Fjädring"
 
@@ -1467,8 +1488,9 @@ msgstr "Bestämmer mattnings-funktionen för fjädringen"
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr "Linjär"
 
@@ -1487,7 +1509,7 @@ msgstr "Sigmond"
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr "Kosinus"
 
@@ -1567,9 +1589,11 @@ msgstr "Radien på de inre punkterna i stjärnan"
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr "Vinkel"
 
@@ -1655,10 +1679,10 @@ msgstr "Global bredd på gradienten"
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr "Repetera"
 
@@ -1801,32 +1825,32 @@ msgstr "Ändra för att modifiera slump-seed för bruset"
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr "Interpolation"
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr "Vilken typ av interpolation som ska användas"
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr "Närmaste granne"
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr "Spline"
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr "Kubisk"
 
@@ -1885,13 +1909,20 @@ msgstr ""
 "När detta alternativ är ikryssat används \"supersampling\" på gradienten"
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr "Länk"
 
@@ -1913,6 +1944,7 @@ msgid "Seeds the random number generator"
 msgstr "Seed för slumpgeneratorn"
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr "Hastighet"
 
@@ -1999,8 +2031,9 @@ msgstr ""
 "När detta alternativ är ikryssat, multipliceras alfa-kanalen från gradienten "
 "med stjäökstorleken, och ett alfavärde på 1,0 används vid rendering"
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr "Vänd"
 
@@ -2008,8 +2041,9 @@ msgstr "Vänd"
 msgid "If enabled, render the plant in the opposite direction"
 msgstr "När detta alternativ är ikryssat renderas växten i motsatt riktning"
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr "Steg"
 
@@ -2222,7 +2256,7 @@ msgstr "Importer::open():Kunde inte hitta filnamnstillägg"
 msgid "Importer::open(): Unknown file type -- "
 msgstr "Importer::open():Okänt filformat --"
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr "Kan inte skapa ytmål"
 
@@ -2234,254 +2268,297 @@ msgstr "Z-djup"
 msgid "Modifies the position of the layer in the layer stack"
 msgstr "Anger lagrets postion i lagerhögen"
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr " Övre vänstra hörnet"
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr "Positionen för bildens övre vänstra hörn"
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr "Nedre högra hörnet"
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr "Positionen för bildens nedre högra hörn"
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr "Lagrets alfa-kanal"
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr "Blandningsmetod"
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 "Blandningsmetoden att använda för att kombinera bilden med lagren under"
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr "Duplicera"
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr "Index"
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr "Kopiera index"
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr "[MIME]"
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr "Rörelse-oskärpa"
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr "Bländare"
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr "Slutartid"
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr "Subsamplings-faktot"
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr "Ökar antalet subsamplingar som renderas"
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr "Typ av subsampling"
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr "Kurvtyp för att påverka subsamplingar"
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr "Konstant"
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr "Hyperbolisk"
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr "Startmängd på subsampling"
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr "Relativ mängd på första subsamplingen, för linjär kurvtyp."
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr "Slutmängd på subsampling"
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr "Relativ mängd på sista subsamplingen, för linjär kurvtyp"
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr "Rityta"
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr "Tidsförskjutning att tillämpa på området"
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 "När detta alternativ är ikryssat kan inte ättlingar markeras med musklick"
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr "Nuvarande tid"
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr "Polygon"
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr "Vertexlista"
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr "Anger hörnen på polygonen"
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr "Form"
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr "Intern"
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr "Layer_Shape Color"
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr "Kantutjämning"
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr "Fjädringstyp"
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr "Typ av fjädring att använda"
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr "Slingringstyp"
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr "Vilken stil på slingring som ska användas"
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr "Inte noll"
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr "Jämn/udda"
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr "Namn"
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+#, fuzzy
+msgid "First corner of the bounds rectangle"
+msgstr "Första hörnet i rektangeln"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+#, fuzzy
+msgid "Second corner of the bounds rectangle"
+msgstr "Andra hörnet i rektangeln"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+#, fuzzy
+msgid "Horizontal subdivisions"
+msgstr "Vågrät mellanrum"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr "Solid färg"
 
-#: src/synfig/layer_sound.cpp:51
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
-msgstr "Kan inte öppna fil"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr "Växla"
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2782,7 +2859,7 @@ msgstr "tom \"author\"-enhet"
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr "Ritytan \"%s\" har odefinierad %s: %s"
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr "Värdenod"
 
@@ -2985,8 +3062,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr "Sammansättning"
 
@@ -3026,13 +3103,13 @@ msgstr ""
 msgid "Divide"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr "Addera"
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr "Subtrahera"
 
@@ -3048,12 +3125,14 @@ msgstr ""
 msgid "Darken"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr "Färg"
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr "Mättnad"
 
@@ -3168,230 +3247,260 @@ msgid ""
 msgstr ""
 "Time():Ingen enhet angiven i tidskod och FPS är okänt! Använder SEKUNDER"
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr "Radiell sammansättning"
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr "Referens"
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr "Segmenttangent"
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr "Segmenthörn"
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr "Ränder"
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr "Två-tonig"
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr "Dynamisk lista"
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr "Gradient-rotation"
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr "Sinus"
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr "Tajmat byte"
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr "Repetera gradient"
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr "Exponential"
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr "Rad"
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr "Kosinus"
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr "aTan2"
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr "Invertera tangenter"
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr "Reciprokal"
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr "Heltal"
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr "Vektorns vinkel"
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr "Vektorns längd"
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr "Vektor X"
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr "Vektor Y"
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr "Gradientens färg"
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr "Skalärprodukt"
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr "Tidssträng"
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr "Tal"
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr "Reell sträng"
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr "Sammanslagen lista"
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr "Vinkelsträng"
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr "Heltalssträng"
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr "Logaritm"
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr "Grånad"
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr "Styrks"
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr "Jämför"
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr "Inte"
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr "Och"
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr "Eller"
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr "Ogiltig typ: värdenod '%s' accepterar inte typ '%s'"
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr "Platshållare"
 
@@ -3400,1268 +3509,1304 @@ msgstr "Platshållare"
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr "%s:%d fel typ för %s: behöver %s men fick %s"
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ":Ogiltig typ"
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr "En eller båda av mina parametrar är inte inställda!"
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr "VS"
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr "Vänstra sidan av adderingen"
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr "HS"
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr "Höger sida av adderingen"
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr "Skalär"
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr "Värde som multiplicerar adderingen"
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr "OCH"
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr "Länk1"
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr "Första operanden i OCH-operationen"
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr "Länk2"
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr "Andra operanden i OCH-operationen"
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr "Reelt värde att konvertera till sträng"
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr "Strängens längd"
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr "Precision"
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr "Antal decimalplatser"
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr "Fyll ut med nollor"
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 "När detta är på, fylls strängen med nollor från vänster för att få rätt längd"
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr "Det finns redan en vägpunkt på den här tidpunkten"
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr "%s: Du kan inte använda %s i en animerad värdenod"
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr "Animerad"
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr "X"
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr "Inget innehåll i listam"
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr "Inget innehåll i ret_list"
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr "Vertex %03d"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr "När detta alternativ är ikryssat, repeteras värdet"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr "Förskjutning"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr "Vinkel-förskjutning av tangenten"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr "Storlek på tangenten"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr "Fast längd"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr "När detta alternativ är ikryssat, kan inte tangentens längd ändras"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr "Bredd"
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr "Vänstra sidan av jämförelsen"
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr "Högra sidan av jämförelsen"
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr "Större än"
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr "När detta är valt, får du ett sant om VÄNSTER > HÖGER"
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr "Lika med"
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr "När detta är valt, får du ett sant om VÄNSTER = HÖGER"
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr "Mindre än"
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr "När detta är valt, får du ett sant om VÄNSTER < HÖGER"
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr "Ogiltig typ för sammansättning"
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr "Röf"
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr "Färgens röda komponent"
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr "Grön"
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr "Färgens gröna komponent"
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr "Blå"
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr "Färgens blåa komponent"
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr "Alfa"
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr "Färgens alfa (genomskinlighet)"
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr "Vertex 1"
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr "Den första vertexen i segmentet"
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr "Tangent 1"
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr "Den första tangenten i segmentet"
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr "Vertex 2"
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr "Den andra vertexen i segmentet"
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr "Tangent 2"
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr "Den andra tangenten i segmentet"
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr "X-axeln"
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr "Vektorns X-komponent"
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr "Y-axeln"
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr "Vektorns Y-komponent"
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr "Vertex"
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr "Bestämmer på/av-värde relativt till grannar"
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr "Dela"
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr "När detta är på, blir tangenterna oberoende"
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr "Längd"
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr "Värde"
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr "Värde att räkna ut kosinus för"
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr "Amplitud"
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr "Multiplikator för resultatet av kosinus"
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr "Från"
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr "Ursprungsvärde för indexet"
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr "Till"
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr "Slutvärde för indexet"
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr "Indexets ökning"
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr "List type/item type mismatch, throwing away mismatch"
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr "Objekt %03d"
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr "Exponent"
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr "Värdet att upphöja konstanten 'e' med"
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr "Multiplikator för resultatet av exponenten"
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr "Källgradienten att rotera"
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr "Mängden förskjutning att tillämpa på gradienten"
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr "Heltalsvärdet att konvertera"
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr "Strängar"
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr "Listan på strängar att slå ihop"
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr "Före"
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr "En sträng som placeras före de sammanslagna strängarna"
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr "Separator"
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr "En sträng som placeras emellan varje sammanslagen sträng"
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr "Efter"
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr "En sträng som placeras efter de sammanslagna strängarna"
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr "Epsilon"
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr "Oändligt"
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr "Det värde du får när resultatet verkar bli ett oändligt tal"
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr "INTE"
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr "Värdenod som används för att utföra en INTE-operation"
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr "ELLER"
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr "Värdenod som används för en boolesk ELLER-operation"
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr "Bas"
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr "Basen som ska upphöjas"
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr "Exponenten för att upphöja basen"
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr "Värde som används för att jämföra basen eller exponenten med noll"
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr " "
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr "Luma"
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr "Längden på vektorn"
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr "Theta"
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr "Vinkeln på vektorn med X-axeln"
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr "Några av parametrarna är inte inställda!"
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr "Min"
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr "Det värde du får när 'Länk' är mindre"
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr "Max"
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr "Det värde du får när 'Länk' är större"
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr "Värdenoden för att begränsa den"
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr "Värdenoded för att räkna ut dess reciproka värde"
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 "Värdet som används för att om 'Länk' är för litet för att kunna få tag på "
 "dess reciproka värde"
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr "Resultatvärdet när 'Länk' < 'Epsilon'"
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr "Det refererade värdet"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr "Källgradienten som ska upprepas"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr "Räkna"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr "Antalet upprepningar på gradienten"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr "Ange start"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 "När detta är på, används 'Startfärg' som start på den färdiga gradienten"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr "Ange slut"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 "När detta är på, används 'Slutfärg' som start på den färdiga gradienten"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr "Används som start på den färdiga gradienten"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr "Slutfärg"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr "Används som slut på den färdiga gradienten"
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+#, fuzzy
+msgid "The value to be reversed"
+msgstr "Heltalsvärdet att konvertera"
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr "Försöker invertera en Värdenod som inte kan inverteras"
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr "Värdenoden för att skala (ändra storlek)"
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr "Värde som multiplicerar Värdenoden"
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr "Segment"
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr "Segmentet tangenten är länkad med"
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr "Den länkade tangentens position i segmentet [0,1]"
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr "Segmentet vertexen är länkad till"
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr "Den länkade vertexens position i segmentet [0,1]"
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr "Vinkeln att räkna ut sinus för"
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr "Värde som multiplicerar det uträknade sinus-värdet"
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr "Värdenod för att göra ett steg"
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr "Längd på steget"
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr "Starttid"
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr "Tiden då steg-övergången startar"
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr "Skärningspunkt"
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr "Färg 1"
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr "En av färgerna på gradient-ränderna"
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr "Färg 2"
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr "Den andra färgen på gradient-ränderna"
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr "Antal ränder"
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr "Antal ränder i gradienten"
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr "Bredd på ränderna i gradienten, mellan [0,1]"
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr "Vänstra sidan av subtraktionen"
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr "Högra sidan av subtraktionen"
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr "Värde som multiplicerar subtraktionen"
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr "Länk av"
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr "Värdenoden som fås när växeln är av"
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr "Länk på"
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr "Värdenod som fås när växeln är på"
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr "När detta är på ges \"Länk på\", annars \"Länk av\""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr "Värdenoden som fås när den nuvarande tiden är före 'tid' - 'längd'"
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr "Värdenoden som fås när den nuvarande tiden är efter 'tid'"
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr "Tid"
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr "Tiden då den linjära interpolationen slutar"
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
@@ -4669,57 +4814,58 @@ msgstr ""
 "Tiden för den linjära interpolationen mellan att 'Före' och 'Efter' har "
 "gjorts"
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr "Värdenoden för tidsslingor"
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr "Tiden att konvertera till en sträng"
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr "Startfärg på gradienten"
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr "Slutfärg på gradienten"
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr "Vektor"
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/synfig.pot b/po/synfig.pot
index f1080e3..93ce0e1 100644
--- a/po/synfig.pot
+++ b/po/synfig.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -26,8 +26,9 @@ msgstr ""
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr ""
 
@@ -53,8 +54,9 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr ""
 
@@ -72,7 +74,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr ""
 
@@ -85,7 +87,7 @@ msgid "Italic"
 msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr ""
 
@@ -155,9 +157,12 @@ msgstr ""
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr ""
 
@@ -191,7 +196,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr ""
 
@@ -236,27 +241,27 @@ msgid "Type of blur to use"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr ""
 
@@ -343,6 +348,7 @@ msgstr ""
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr ""
 
@@ -353,13 +359,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr ""
 
@@ -417,7 +424,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr ""
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr ""
 
@@ -425,7 +432,8 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr ""
 
@@ -592,7 +600,8 @@ msgstr ""
 msgid "Scale Outside"
 msgstr ""
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr ""
 
@@ -609,12 +618,13 @@ msgstr ""
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr ""
 
@@ -636,7 +646,7 @@ msgid "Spherize"
 msgstr ""
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr ""
 
@@ -651,7 +661,7 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr ""
 
@@ -755,12 +765,13 @@ msgstr ""
 msgid "Avoid alpha artifacts when checked"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr ""
 
@@ -768,16 +779,19 @@ msgstr ""
 msgid "Start time of the loop for the cycled context"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr ""
 
@@ -801,7 +815,8 @@ msgstr ""
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr ""
 
@@ -910,11 +925,12 @@ msgstr ""
 msgid "Size of the pattern"
 msgstr ""
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr ""
 
@@ -1004,13 +1020,14 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr ""
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr ""
 
@@ -1022,6 +1039,7 @@ msgstr ""
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr ""
 
@@ -1061,9 +1079,9 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr ""
 
@@ -1127,7 +1145,7 @@ msgid "Blur"
 msgstr ""
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr ""
 
@@ -1155,7 +1173,8 @@ msgstr ""
 msgid "Exposure Adjust"
 msgstr ""
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr ""
 
@@ -1255,7 +1274,8 @@ msgstr ""
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr ""
 
@@ -1301,37 +1321,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr ""
 
@@ -1365,14 +1385,14 @@ msgid "Smoothness"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr ""
 
@@ -1440,7 +1460,8 @@ msgstr ""
 msgid "Radius of the circle"
 msgstr ""
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr ""
 
@@ -1463,8 +1484,9 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr ""
 
@@ -1483,7 +1505,7 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr ""
 
@@ -1563,9 +1585,11 @@ msgstr ""
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr ""
 
@@ -1651,10 +1675,10 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr ""
 
@@ -1797,32 +1821,32 @@ msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr ""
 
@@ -1880,13 +1904,20 @@ msgid "When checked the gradient is supersampled"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr ""
 
@@ -1908,6 +1939,7 @@ msgid "Seeds the random number generator"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr ""
 
@@ -1992,8 +2024,9 @@ msgid ""
 "size, and an alpha of 1.0 is used when rendering"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr ""
 
@@ -2001,8 +2034,9 @@ msgstr ""
 msgid "If enabled, render the plant in the opposite direction"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr ""
 
@@ -2213,7 +2247,7 @@ msgstr ""
 msgid "Importer::open(): Unknown file type -- "
 msgstr ""
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr ""
 
@@ -2225,251 +2259,292 @@ msgstr ""
 msgid "Modifies the position of the layer in the layer stack"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr ""
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+msgid "First corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+msgid "Second corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+msgid "Horizontal subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:51
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2765,7 +2840,7 @@ msgstr ""
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr ""
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr ""
 
@@ -2967,8 +3042,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr ""
 
@@ -3008,13 +3083,13 @@ msgstr ""
 msgid "Divide"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr ""
 
@@ -3030,12 +3105,14 @@ msgstr ""
 msgid "Darken"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr ""
 
@@ -3149,230 +3226,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr ""
 
@@ -3381,1319 +3488,1355 @@ msgstr ""
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+msgid "The value to be reversed"
+msgstr ""
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/tr.gmo b/po/tr.gmo
index 6de0f56..e3d9723 100644
Binary files a/po/tr.gmo and b/po/tr.gmo differ
diff --git a/po/tr.po b/po/tr.po
index d6c35e3..213dd28 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,10 +6,10 @@
 # Erkan Kocaman <erkank_83 at hotmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/synfig/language/"
 "tr/)\n"
@@ -28,8 +28,9 @@ msgstr "Metin"
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "Diğer"
 
@@ -55,8 +56,9 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "Renk"
 
@@ -74,7 +76,7 @@ msgstr "Biçem"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr "Normal"
 
@@ -87,7 +89,7 @@ msgid "Italic"
 msgstr "İtalik"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr "Genişlik"
 
@@ -157,9 +159,12 @@ msgstr "Metin Yönü"
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr ""
 
@@ -193,7 +198,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr "Tersine Çevir"
 
@@ -238,27 +243,27 @@ msgid "Type of blur to use"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr ""
 
@@ -345,6 +350,7 @@ msgstr ""
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr ""
 
@@ -355,13 +361,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr "Genişlik"
 
@@ -419,7 +426,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr ""
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr "Dosya adı"
 
@@ -427,7 +434,8 @@ msgstr "Dosya adı"
 msgid "File to import"
 msgstr "İçe aktarılacak dosya"
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr ""
 
@@ -594,7 +602,8 @@ msgstr ""
 msgid "Scale Outside"
 msgstr ""
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr ""
 
@@ -611,12 +620,13 @@ msgstr ""
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr "Katman görünürlüğü ayarlar"
 
@@ -638,7 +648,7 @@ msgid "Spherize"
 msgstr ""
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr ""
 
@@ -653,7 +663,7 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr ""
 
@@ -757,12 +767,13 @@ msgstr ""
 msgid "Avoid alpha artifacts when checked"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr ""
 
@@ -770,16 +781,19 @@ msgstr ""
 msgid "Start time of the loop for the cycled context"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr ""
 
@@ -803,7 +817,8 @@ msgstr ""
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr ""
 
@@ -912,11 +927,12 @@ msgstr ""
 msgid "Size of the pattern"
 msgstr ""
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr ""
 
@@ -1006,13 +1022,14 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr ""
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr ""
 
@@ -1024,6 +1041,7 @@ msgstr ""
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr ""
 
@@ -1063,9 +1081,9 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr "Renk Geçişi"
 
@@ -1129,7 +1147,7 @@ msgid "Blur"
 msgstr ""
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr ""
 
@@ -1157,7 +1175,8 @@ msgstr ""
 msgid "Exposure Adjust"
 msgstr ""
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr ""
 
@@ -1257,7 +1276,8 @@ msgstr ""
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr ""
 
@@ -1303,37 +1323,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr ""
 
@@ -1367,14 +1387,14 @@ msgid "Smoothness"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr ""
 
@@ -1442,7 +1462,8 @@ msgstr ""
 msgid "Radius of the circle"
 msgstr ""
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr ""
 
@@ -1465,8 +1486,9 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr "Doğrusal"
 
@@ -1485,7 +1507,7 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr ""
 
@@ -1565,9 +1587,11 @@ msgstr ""
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr "Açı"
 
@@ -1653,10 +1677,10 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr "Döngü"
 
@@ -1799,32 +1823,32 @@ msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr ""
 
@@ -1882,13 +1906,20 @@ msgid "When checked the gradient is supersampled"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr ""
 
@@ -1910,6 +1941,7 @@ msgid "Seeds the random number generator"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr ""
 
@@ -1994,8 +2026,9 @@ msgid ""
 "size, and an alpha of 1.0 is used when rendering"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr ""
 
@@ -2003,8 +2036,9 @@ msgstr ""
 msgid "If enabled, render the plant in the opposite direction"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr ""
 
@@ -2215,7 +2249,7 @@ msgstr ""
 msgid "Importer::open(): Unknown file type -- "
 msgstr ""
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr ""
 
@@ -2227,252 +2261,294 @@ msgstr "Z Derinlik"
 msgid "Modifies the position of the layer in the layer stack"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr "Çoğalt"
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr ""
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr "Sabit"
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr "Tuval"
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr "İsim"
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+#, fuzzy
+msgid "First corner of the bounds rectangle"
+msgstr "Kaynak çizginin ilk noktası"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+msgid "Second corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+#, fuzzy
+msgid "Horizontal subdivisions"
+msgstr "Yatay boşluk"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:51
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
-msgstr "Dosya açılamıyor"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2768,7 +2844,7 @@ msgstr ""
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr ""
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr "DeğerKökü"
 
@@ -2970,8 +3046,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr ""
 
@@ -3011,13 +3087,13 @@ msgstr ""
 msgid "Divide"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr ""
 
@@ -3033,12 +3109,14 @@ msgstr ""
 msgid "Darken"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr ""
 
@@ -3152,230 +3230,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr "Referans"
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr "Tamsayı"
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr "Gerçel"
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr ""
 
@@ -3384,1319 +3492,1355 @@ msgstr ""
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr "X"
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr "Kırmızı"
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr "Yeşil"
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr "Mavi"
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr "Alfa"
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr "Genişlik"
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr "Değer"
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+msgid "The value to be reversed"
+msgstr ""
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr "Segment"
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr "Zaman"
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr "Vektör"
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/gl.gmo b/po/ur.gmo
similarity index 50%
copy from po/gl.gmo
copy to po/ur.gmo
index bba979a..d10d670 100644
Binary files a/po/gl.gmo and b/po/ur.gmo differ
diff --git a/po/bs.po b/po/ur.po
similarity index 71%
copy from po/bs.po
copy to po/ur.po
index 79dd9e2..88b9b79 100644
--- a/po/bs.po
+++ b/po/ur.po
@@ -5,19 +5,18 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
-"Language-Team: Bosnian (http://www.transifex.com/projects/p/synfig/language/"
-"bs/)\n"
-"Language: bs\n"
+"Language-Team: Urdu (http://www.transifex.com/projects/p/synfig/language/"
+"ur/)\n"
+"Language: ur\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:66
 #: src/modules/lyr_freetype/lyr_freetype.cpp:569
@@ -28,8 +27,9 @@ msgstr ""
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr ""
 
@@ -55,8 +55,9 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr ""
 
@@ -74,7 +75,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr ""
 
@@ -87,7 +88,7 @@ msgid "Italic"
 msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr ""
 
@@ -157,9 +158,12 @@ msgstr ""
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr ""
 
@@ -193,7 +197,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr ""
 
@@ -238,27 +242,27 @@ msgid "Type of blur to use"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr ""
 
@@ -345,6 +349,7 @@ msgstr ""
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr ""
 
@@ -355,13 +360,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr ""
 
@@ -419,7 +425,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr ""
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr ""
 
@@ -427,7 +433,8 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr ""
 
@@ -594,7 +601,8 @@ msgstr ""
 msgid "Scale Outside"
 msgstr ""
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr ""
 
@@ -611,12 +619,13 @@ msgstr ""
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr ""
 
@@ -638,7 +647,7 @@ msgid "Spherize"
 msgstr ""
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr ""
 
@@ -653,7 +662,7 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr ""
 
@@ -757,12 +766,13 @@ msgstr ""
 msgid "Avoid alpha artifacts when checked"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr ""
 
@@ -770,16 +780,19 @@ msgstr ""
 msgid "Start time of the loop for the cycled context"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr ""
 
@@ -803,7 +816,8 @@ msgstr ""
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr ""
 
@@ -912,11 +926,12 @@ msgstr ""
 msgid "Size of the pattern"
 msgstr ""
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr ""
 
@@ -1006,13 +1021,14 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr ""
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr ""
 
@@ -1024,6 +1040,7 @@ msgstr ""
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr ""
 
@@ -1063,9 +1080,9 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr ""
 
@@ -1129,7 +1146,7 @@ msgid "Blur"
 msgstr ""
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr ""
 
@@ -1157,7 +1174,8 @@ msgstr ""
 msgid "Exposure Adjust"
 msgstr ""
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr ""
 
@@ -1257,7 +1275,8 @@ msgstr ""
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr ""
 
@@ -1303,37 +1322,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr ""
 
@@ -1367,14 +1386,14 @@ msgid "Smoothness"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr ""
 
@@ -1442,7 +1461,8 @@ msgstr ""
 msgid "Radius of the circle"
 msgstr ""
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr ""
 
@@ -1465,8 +1485,9 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr ""
 
@@ -1485,7 +1506,7 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr ""
 
@@ -1565,9 +1586,11 @@ msgstr ""
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr ""
 
@@ -1653,10 +1676,10 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr ""
 
@@ -1799,32 +1822,32 @@ msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr ""
 
@@ -1882,13 +1905,20 @@ msgid "When checked the gradient is supersampled"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr ""
 
@@ -1910,6 +1940,7 @@ msgid "Seeds the random number generator"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr ""
 
@@ -1994,8 +2025,9 @@ msgid ""
 "size, and an alpha of 1.0 is used when rendering"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr ""
 
@@ -2003,8 +2035,9 @@ msgstr ""
 msgid "If enabled, render the plant in the opposite direction"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr ""
 
@@ -2215,7 +2248,7 @@ msgstr ""
 msgid "Importer::open(): Unknown file type -- "
 msgstr ""
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr ""
 
@@ -2227,251 +2260,292 @@ msgstr ""
 msgid "Modifies the position of the layer in the layer stack"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr ""
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+msgid "First corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+msgid "Second corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+msgid "Horizontal subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:51
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2767,7 +2841,7 @@ msgstr ""
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr ""
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr ""
 
@@ -2969,8 +3043,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr ""
 
@@ -3010,13 +3084,13 @@ msgstr ""
 msgid "Divide"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr ""
 
@@ -3032,12 +3106,14 @@ msgstr ""
 msgid "Darken"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr ""
 
@@ -3151,230 +3227,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr ""
 
@@ -3383,1319 +3489,1355 @@ msgstr ""
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+msgid "The value to be reversed"
+msgstr ""
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/uz at Latn.gmo b/po/uz at Latn.gmo
index 516ac88..9a3aad1 100644
Binary files a/po/uz at Latn.gmo and b/po/uz at Latn.gmo differ
diff --git a/po/uz at Latn.po b/po/uz at Latn.po
index 82f88d2..c1aed48 100644
--- a/po/uz at Latn.po
+++ b/po/uz at Latn.po
@@ -6,10 +6,10 @@
 # Umid Almasov <u.almasov at gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Uzbek (Latin) (http://www.transifex.com/projects/p/synfig/"
 "language/uz at Latn/)\n"
@@ -28,8 +28,9 @@ msgstr "Matn"
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "Boshqa"
 
@@ -55,8 +56,9 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "Rang"
 
@@ -74,7 +76,7 @@ msgstr "Uslub"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr "Normal"
 
@@ -87,7 +89,7 @@ msgid "Italic"
 msgstr "Kursiv"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr ""
 
@@ -157,9 +159,12 @@ msgstr ""
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr ""
 
@@ -193,7 +198,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr ""
 
@@ -238,27 +243,27 @@ msgid "Type of blur to use"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr ""
 
@@ -345,6 +350,7 @@ msgstr ""
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr ""
 
@@ -355,13 +361,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr ""
 
@@ -419,7 +426,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr ""
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr ""
 
@@ -427,7 +434,8 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr ""
 
@@ -594,7 +602,8 @@ msgstr ""
 msgid "Scale Outside"
 msgstr ""
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr ""
 
@@ -611,12 +620,13 @@ msgstr ""
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr ""
 
@@ -638,7 +648,7 @@ msgid "Spherize"
 msgstr ""
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr ""
 
@@ -653,7 +663,7 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr "Radius"
 
@@ -757,12 +767,13 @@ msgstr ""
 msgid "Avoid alpha artifacts when checked"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr ""
 
@@ -770,16 +781,19 @@ msgstr ""
 msgid "Start time of the loop for the cycled context"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr ""
 
@@ -803,7 +817,8 @@ msgstr ""
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr ""
 
@@ -912,11 +927,12 @@ msgstr ""
 msgid "Size of the pattern"
 msgstr ""
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr ""
 
@@ -1006,13 +1022,14 @@ msgstr "Misol"
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr "Qatlamning bo'yash rangi"
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr "Nuqta 1"
 
@@ -1024,6 +1041,7 @@ msgstr "To'g'riburchakning birinchi burchagi"
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr "Nuqta 2"
 
@@ -1063,9 +1081,9 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr "Gradiyent"
 
@@ -1129,7 +1147,7 @@ msgid "Blur"
 msgstr ""
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr ""
 
@@ -1157,7 +1175,8 @@ msgstr ""
 msgid "Exposure Adjust"
 msgstr ""
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr ""
 
@@ -1257,7 +1276,8 @@ msgstr ""
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr ""
 
@@ -1303,37 +1323,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr ""
 
@@ -1367,14 +1387,14 @@ msgid "Smoothness"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr ""
 
@@ -1442,7 +1462,8 @@ msgstr ""
 msgid "Radius of the circle"
 msgstr ""
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr ""
 
@@ -1465,8 +1486,9 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr ""
 
@@ -1485,7 +1507,7 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr ""
 
@@ -1565,9 +1587,11 @@ msgstr ""
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr ""
 
@@ -1653,10 +1677,10 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr ""
 
@@ -1799,32 +1823,32 @@ msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr ""
 
@@ -1882,13 +1906,20 @@ msgid "When checked the gradient is supersampled"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr ""
 
@@ -1910,6 +1941,7 @@ msgid "Seeds the random number generator"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr ""
 
@@ -1994,8 +2026,9 @@ msgid ""
 "size, and an alpha of 1.0 is used when rendering"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr ""
 
@@ -2003,8 +2036,9 @@ msgstr ""
 msgid "If enabled, render the plant in the opposite direction"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr ""
 
@@ -2215,7 +2249,7 @@ msgstr ""
 msgid "Importer::open(): Unknown file type -- "
 msgstr ""
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr ""
 
@@ -2227,251 +2261,294 @@ msgstr ""
 msgid "Modifies the position of the layer in the layer stack"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr ""
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+#, fuzzy
+msgid "First corner of the bounds rectangle"
+msgstr "To'g'riburchakning birinchi burchagi"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+#, fuzzy
+msgid "Second corner of the bounds rectangle"
+msgstr "To'g'riburchakning ikkinchi burchagi"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+msgid "Horizontal subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:51
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2767,7 +2844,7 @@ msgstr ""
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr ""
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr ""
 
@@ -2969,8 +3046,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr ""
 
@@ -3010,13 +3087,13 @@ msgstr ""
 msgid "Divide"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr ""
 
@@ -3032,12 +3109,14 @@ msgstr ""
 msgid "Darken"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr ""
 
@@ -3151,230 +3230,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr ""
 
@@ -3383,1319 +3492,1355 @@ msgstr ""
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+msgid "The value to be reversed"
+msgstr ""
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/zh-Hant.gmo b/po/zh-Hant.gmo
index 7ccbc71..2f6a9e0 100644
Binary files a/po/zh-Hant.gmo and b/po/zh-Hant.gmo differ
diff --git a/po/zh-Hant.po b/po/zh-Hant.po
index c1cd80a..d762485 100644
--- a/po/zh-Hant.po
+++ b/po/zh-Hant.po
@@ -5,10 +5,10 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Chinese Traditional (http://www.transifex.com/projects/p/"
 "synfig/language/zh-Hant/)\n"
@@ -27,8 +27,9 @@ msgstr ""
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr ""
 
@@ -54,8 +55,9 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr ""
 
@@ -73,7 +75,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr ""
 
@@ -86,7 +88,7 @@ msgid "Italic"
 msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr ""
 
@@ -156,9 +158,12 @@ msgstr ""
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr ""
 
@@ -192,7 +197,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr ""
 
@@ -237,27 +242,27 @@ msgid "Type of blur to use"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr ""
 
@@ -344,6 +349,7 @@ msgstr ""
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr ""
 
@@ -354,13 +360,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr ""
 
@@ -418,7 +425,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr ""
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr ""
 
@@ -426,7 +433,8 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr ""
 
@@ -593,7 +601,8 @@ msgstr ""
 msgid "Scale Outside"
 msgstr ""
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr ""
 
@@ -610,12 +619,13 @@ msgstr ""
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr ""
 
@@ -637,7 +647,7 @@ msgid "Spherize"
 msgstr ""
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr ""
 
@@ -652,7 +662,7 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr ""
 
@@ -756,12 +766,13 @@ msgstr ""
 msgid "Avoid alpha artifacts when checked"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr ""
 
@@ -769,16 +780,19 @@ msgstr ""
 msgid "Start time of the loop for the cycled context"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr ""
 
@@ -802,7 +816,8 @@ msgstr ""
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr ""
 
@@ -911,11 +926,12 @@ msgstr ""
 msgid "Size of the pattern"
 msgstr ""
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr ""
 
@@ -1005,13 +1021,14 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr ""
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr ""
 
@@ -1023,6 +1040,7 @@ msgstr ""
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr ""
 
@@ -1062,9 +1080,9 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr ""
 
@@ -1128,7 +1146,7 @@ msgid "Blur"
 msgstr ""
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr ""
 
@@ -1156,7 +1174,8 @@ msgstr ""
 msgid "Exposure Adjust"
 msgstr ""
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr ""
 
@@ -1256,7 +1275,8 @@ msgstr ""
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr ""
 
@@ -1302,37 +1322,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr ""
 
@@ -1366,14 +1386,14 @@ msgid "Smoothness"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr ""
 
@@ -1441,7 +1461,8 @@ msgstr ""
 msgid "Radius of the circle"
 msgstr ""
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr ""
 
@@ -1464,8 +1485,9 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr ""
 
@@ -1484,7 +1506,7 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr ""
 
@@ -1564,9 +1586,11 @@ msgstr ""
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr ""
 
@@ -1652,10 +1676,10 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr ""
 
@@ -1798,32 +1822,32 @@ msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr ""
 
@@ -1881,13 +1905,20 @@ msgid "When checked the gradient is supersampled"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr ""
 
@@ -1909,6 +1940,7 @@ msgid "Seeds the random number generator"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr ""
 
@@ -1993,8 +2025,9 @@ msgid ""
 "size, and an alpha of 1.0 is used when rendering"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr ""
 
@@ -2002,8 +2035,9 @@ msgstr ""
 msgid "If enabled, render the plant in the opposite direction"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr ""
 
@@ -2214,7 +2248,7 @@ msgstr ""
 msgid "Importer::open(): Unknown file type -- "
 msgstr ""
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr ""
 
@@ -2226,251 +2260,292 @@ msgstr ""
 msgid "Modifies the position of the layer in the layer stack"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr ""
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+msgid "First corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+msgid "Second corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+msgid "Horizontal subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:51
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2766,7 +2841,7 @@ msgstr ""
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr ""
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr ""
 
@@ -2968,8 +3043,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr ""
 
@@ -3009,13 +3084,13 @@ msgstr ""
 msgid "Divide"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr ""
 
@@ -3031,12 +3106,14 @@ msgstr ""
 msgid "Darken"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr ""
 
@@ -3150,230 +3227,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr ""
 
@@ -3382,1319 +3489,1355 @@ msgstr ""
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+msgid "The value to be reversed"
+msgstr ""
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 2453ee9..4757905 100644
Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8752ced..1d88947 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,10 +7,10 @@
 # Yu Chen <jcomee at gmail.com>, 2010-2011
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/synfig/"
 "language/zh_CN/)\n"
@@ -29,8 +29,9 @@ msgstr "文本"
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "其他"
 
@@ -56,8 +57,9 @@ msgstr "要渲染的文本"
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "颜色"
 
@@ -75,7 +77,7 @@ msgstr "风格"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr "普通"
 
@@ -88,7 +90,7 @@ msgid "Italic"
 msgstr "斜体"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr "浓淡"
 
@@ -158,9 +160,12 @@ msgstr "文本的方向"
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr "原点"
 
@@ -194,7 +199,7 @@ msgstr "如果您准备动画文本,请把它关掉"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr "反相"
 
@@ -239,27 +244,27 @@ msgid "Type of blur to use"
 msgstr "要采用的模糊类型"
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr "盒形模糊"
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr "快速高斯模糊"
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr "交叉影线模糊"
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr "高斯模糊"
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr "圆盘形模糊"
 
@@ -346,6 +351,7 @@ msgstr "曲线翘曲"
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr "变形"
 
@@ -356,13 +362,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr "宽度"
 
@@ -420,7 +427,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr "文件名好像已经设置为“%s”(%s)"
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr "文件名"
 
@@ -428,7 +435,8 @@ msgstr "文件名"
 msgid "File to import"
 msgstr "要输入的文件"
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr "时间偏移"
 
@@ -595,7 +603,8 @@ msgstr "外部位移"
 msgid "Scale Outside"
 msgstr "外部缩放"
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr "旋转"
 
@@ -612,12 +621,13 @@ msgstr "您想要放置原点的位置点"
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr "量"
 
@@ -639,7 +649,7 @@ msgid "Spherize"
 msgstr "球面化"
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr "位置"
 
@@ -654,7 +664,7 @@ msgstr "球状变形的中点"
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr "半径"
 
@@ -758,12 +768,13 @@ msgstr "确保透明(Alpha)安全"
 msgid "Avoid alpha artifacts when checked"
 msgstr "选中后避免产生alpha伪像"
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr "时间循环"
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr "链接时间"
 
@@ -771,16 +782,19 @@ msgstr "链接时间"
 msgid "Start time of the loop for the cycled context"
 msgstr "循环的起始时间"
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr "本地时间"
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr "促成循环启动的时间"
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr "持续"
 
@@ -804,7 +818,8 @@ msgstr "对称"
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr "选中后,循环以本地时间为中点做镜像"
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr "位移"
 
@@ -913,11 +928,12 @@ msgstr ""
 msgid "Size of the pattern"
 msgstr ""
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr "缩放"
 
@@ -1007,13 +1023,14 @@ msgstr "示例"
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr "填充层的颜色"
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr "点1"
 
@@ -1025,6 +1042,7 @@ msgstr "矩形的第一个角"
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr "点2"
 
@@ -1064,9 +1082,9 @@ msgstr "变形球"
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr "渐变"
 
@@ -1130,7 +1148,7 @@ msgid "Blur"
 msgstr "模糊"
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr "模糊"
 
@@ -1158,7 +1176,8 @@ msgstr "对比"
 msgid "Exposure Adjust"
 msgstr "曝光调整"
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr "伽马调整"
 
@@ -1258,7 +1277,8 @@ msgstr "高级轮廓"
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr "几何图形"
 
@@ -1304,37 +1324,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr "圆的"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr "方的"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr "尖的"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr "平的"
 
@@ -1368,14 +1388,15 @@ msgid "Smoothness"
 msgstr "平滑的"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+#, fuzzy
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr "决定宽度点之间的变化。(0)线性 (1)平滑"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr "单一性"
 
@@ -1443,7 +1464,8 @@ msgstr "圆形"
 msgid "Radius of the circle"
 msgstr "圆形的半径"
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr "羽化"
 
@@ -1466,8 +1488,9 @@ msgstr "决定羽化的衰减功能"
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr "线性"
 
@@ -1486,7 +1509,7 @@ msgstr "西格玛"
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr "余弦"
 
@@ -1566,9 +1589,11 @@ msgstr "星形内角的半径"
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr "角度"
 
@@ -1654,10 +1679,10 @@ msgstr "渐变的全局宽度"
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr "循环"
 
@@ -1800,32 +1825,32 @@ msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr "插值方法"
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr "要用的插值类型"
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr "最近的邻居"
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr "Spline"
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr "立方"
 
@@ -1883,13 +1908,20 @@ msgid "When checked the gradient is supersampled"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr "链接"
 
@@ -1911,6 +1943,7 @@ msgid "Seeds the random number generator"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr ""
 
@@ -1995,8 +2028,9 @@ msgid ""
 "size, and an alpha of 1.0 is used when rendering"
 msgstr "如果打开,渐变的透明度通道用茎的大小相乘,在渲染是使用的透明度为1.0"
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr "颠倒"
 
@@ -2004,8 +2038,9 @@ msgstr "颠倒"
 msgid "If enabled, render the plant in the opposite direction"
 msgstr "如果激活,植物出现在另一面"
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr "步长"
 
@@ -2216,7 +2251,7 @@ msgstr "输入::打开():不能找到扩展名"
 msgid "Importer::open(): Unknown file type -- "
 msgstr "输入::打开():未知文件类型——"
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr "未能创建面目标"
 
@@ -2228,253 +2263,295 @@ msgstr "Z 深度"
 msgid "Modifies the position of the layer in the layer stack"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr "左上角"
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr "图像的左上角"
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr "右下角"
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr "图像的右下角"
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr "混合方式"
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr "复制"
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr "索引"
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr "拷贝索引"
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr "[MIME]"
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr "运动模糊"
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr "光圈"
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr "快门时间"
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr "二次抽样系数"
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr "乘预渲染的子样本的数量"
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr "二次抽样类型"
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr "用于权重子样本的曲线类型"
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr "常量"
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr "双曲线"
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr "二次抽样始量"
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr "第一个子样本的相关量,用于线性权重"
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr "二次抽样末量"
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr "最后子样本的相关量,用于线性权重"
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr "画布"
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr "当前时间"
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr "多边形"
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr "图形"
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr "内部"
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr "层图形颜色"
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr "抗锯齿"
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr "羽化类型"
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr "要使用的羽化类型"
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr "蜿蜒风格"
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr "要使用的蜿蜒风格"
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr "非零"
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr "奇/偶"
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr "名字"
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+#, fuzzy
+msgid "First corner of the bounds rectangle"
+msgstr "矩形的第一个角"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+#, fuzzy
+msgid "Second corner of the bounds rectangle"
+msgstr "矩形的第二个角"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+#, fuzzy
+msgid "Horizontal subdivisions"
+msgstr "字距"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr "平涂色"
 
-#: src/synfig/layer_sound.cpp:51
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
-msgstr "圆的"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
-msgstr "未能打开文件"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr "开关"
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2770,7 +2847,7 @@ msgstr "空白的“作者”栏"
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr "画布‘%s’还么定义%s:%s"
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr "值节点"
 
@@ -2972,8 +3049,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr "复合"
 
@@ -3013,13 +3090,13 @@ msgstr ""
 msgid "Divide"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr "添加"
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr "部分追踪"
 
@@ -3035,12 +3112,14 @@ msgstr ""
 msgid "Darken"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr "色调"
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr "饱和度"
 
@@ -3154,230 +3233,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr "半径复合"
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr "引用"
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr "线段切线"
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr "线段顶点"
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr "条纹"
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr "双色调"
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr "动态清单"
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr "渐变旋转"
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr "正弦"
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr "定时交换"
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr "重复渐变"
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr "指数"
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr "范围"
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr "余弦"
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr "反正切"
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr "倒数"
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr "整数"
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr "向量角度"
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr "向量长度"
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr "向量 X"
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr "向量 Y"
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr "渐变色"
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr "时间字符串"
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr "实数"
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr "实数字符串"
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr "加入的清单"
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr "角度字符串"
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr "整数字符串"
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr "对数"
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr "变灰的"
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr "幂"
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr "比较"
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr "非"
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr "与"
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr "或"
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr "错误类型:值节点‘%s’不接受‘%s’类型"
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr "位置标志符"
 
@@ -3386,1319 +3495,1355 @@ msgstr "位置标志符"
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr "%s:%d,%s的错误类型:需要%s却得到%s"
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ":错误类型"
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr "我的参数的一个或两个都没有被设定!"
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr "左侧"
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr "右侧"
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr "等比"
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr "与"
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr "链接1"
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr "链接2"
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr "精度"
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr "零填充"
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr "在这个时间点上已存在一个航点"
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr "%s:您不能在有动画的值节点中使用一个%s"
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr "动画"
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr "X"
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr "清单中没有条目"
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr "没有条目在 Ret_list"
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr "顶点%03d"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr "偏移"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr "固定长度"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr "复合的错误类型"
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr "红"
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr "绿"
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr "蓝"
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr "透明"
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr "顶点1"
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr "切线1"
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr "顶点2"
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr "切线2"
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr "顶点"
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr "插值"
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr "长度"
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr "值"
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr "增幅"
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr "从"
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr "到"
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr "清单类型/项目不匹配,抛弃不匹配的"
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr "项目%03d"
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr "指数"
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr "字符串"
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr "之前"
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr "分割器"
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr "之后"
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr "比率"
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr "倾斜"
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr "无穷"
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr "非"
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr "或"
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr "基底"
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr "径向复合的错误类型"
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr "亮度"
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr "θ"
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr "我的一些参数没有设定!"
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr "最小"
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr "最大"
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr "计数"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr "指定起点"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr "指定终点"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr "起点颜色"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr "终点颜色"
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+msgid "The value to be reversed"
+msgstr ""
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr "试图获取一个不可反的值节点的相反值"
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr "线段"
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr "开始时间"
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr "交集"
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr "颜色1"
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr "颜色2"
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr "条纹数"
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr "时间"
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr "向量"
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/zh_TW.Big5.gmo b/po/zh_TW.Big5.gmo
new file mode 100644
index 0000000..a494eb4
Binary files /dev/null and b/po/zh_TW.Big5.gmo differ
diff --git a/po/bs.po b/po/zh_TW.Big5.po
similarity index 71%
copy from po/bs.po
copy to po/zh_TW.Big5.po
index 79dd9e2..c164d24 100644
--- a/po/bs.po
+++ b/po/zh_TW.Big5.po
@@ -5,19 +5,18 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
-"Language-Team: Bosnian (http://www.transifex.com/projects/p/synfig/language/"
-"bs/)\n"
-"Language: bs\n"
+"Language-Team: Chinese (Taiwan) (Big5)  (http://www.transifex.com/projects/p/"
+"synfig/language/zh_TW.Big5/)\n"
+"Language: zh_TW.Big5\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:66
 #: src/modules/lyr_freetype/lyr_freetype.cpp:569
@@ -28,8 +27,9 @@ msgstr ""
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr ""
 
@@ -55,8 +55,9 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr ""
 
@@ -74,7 +75,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr ""
 
@@ -87,7 +88,7 @@ msgid "Italic"
 msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr ""
 
@@ -157,9 +158,12 @@ msgstr ""
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr ""
 
@@ -193,7 +197,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr ""
 
@@ -238,27 +242,27 @@ msgid "Type of blur to use"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr ""
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr ""
 
@@ -345,6 +349,7 @@ msgstr ""
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr ""
 
@@ -355,13 +360,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr ""
 
@@ -419,7 +425,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr ""
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr ""
 
@@ -427,7 +433,8 @@ msgstr ""
 msgid "File to import"
 msgstr ""
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr ""
 
@@ -594,7 +601,8 @@ msgstr ""
 msgid "Scale Outside"
 msgstr ""
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr ""
 
@@ -611,12 +619,13 @@ msgstr ""
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr ""
 
@@ -638,7 +647,7 @@ msgid "Spherize"
 msgstr ""
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr ""
 
@@ -653,7 +662,7 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr ""
 
@@ -757,12 +766,13 @@ msgstr ""
 msgid "Avoid alpha artifacts when checked"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr ""
 
@@ -770,16 +780,19 @@ msgstr ""
 msgid "Start time of the loop for the cycled context"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr ""
 
@@ -803,7 +816,8 @@ msgstr ""
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr ""
 
@@ -912,11 +926,12 @@ msgstr ""
 msgid "Size of the pattern"
 msgstr ""
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr ""
 
@@ -1006,13 +1021,14 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr ""
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr ""
 
@@ -1024,6 +1040,7 @@ msgstr ""
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr ""
 
@@ -1063,9 +1080,9 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr ""
 
@@ -1129,7 +1146,7 @@ msgid "Blur"
 msgstr ""
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr ""
 
@@ -1157,7 +1174,8 @@ msgstr ""
 msgid "Exposure Adjust"
 msgstr ""
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr ""
 
@@ -1257,7 +1275,8 @@ msgstr ""
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr ""
 
@@ -1303,37 +1322,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr ""
 
@@ -1367,14 +1386,14 @@ msgid "Smoothness"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr ""
 
@@ -1442,7 +1461,8 @@ msgstr ""
 msgid "Radius of the circle"
 msgstr ""
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr ""
 
@@ -1465,8 +1485,9 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr ""
 
@@ -1485,7 +1506,7 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr ""
 
@@ -1565,9 +1586,11 @@ msgstr ""
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr ""
 
@@ -1653,10 +1676,10 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr ""
 
@@ -1799,32 +1822,32 @@ msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr ""
 
@@ -1882,13 +1905,20 @@ msgid "When checked the gradient is supersampled"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr ""
 
@@ -1910,6 +1940,7 @@ msgid "Seeds the random number generator"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr ""
 
@@ -1994,8 +2025,9 @@ msgid ""
 "size, and an alpha of 1.0 is used when rendering"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr ""
 
@@ -2003,8 +2035,9 @@ msgstr ""
 msgid "If enabled, render the plant in the opposite direction"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr ""
 
@@ -2215,7 +2248,7 @@ msgstr ""
 msgid "Importer::open(): Unknown file type -- "
 msgstr ""
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr ""
 
@@ -2227,251 +2260,292 @@ msgstr ""
 msgid "Modifies the position of the layer in the layer stack"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr ""
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr ""
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr ""
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr ""
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+msgid "Skeleton Deformation"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+msgid "First corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+msgid "Second corner of the bounds rectangle"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+msgid "Horizontal subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:51
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2767,7 +2841,7 @@ msgstr ""
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr ""
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr ""
 
@@ -2969,8 +3043,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr ""
 
@@ -3010,13 +3084,13 @@ msgstr ""
 msgid "Divide"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr ""
 
@@ -3032,12 +3106,14 @@ msgstr ""
 msgid "Darken"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr ""
 
@@ -3151,230 +3227,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr ""
 
@@ -3383,1319 +3489,1355 @@ msgstr ""
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr ""
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+msgid "The value to be reversed"
+msgstr ""
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index 792d567..620b4db 100644
Binary files a/po/zh_TW.gmo and b/po/zh_TW.gmo differ
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b99e7f7..1d8039f 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,10 +5,10 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: Synfig\n"
+"Project-Id-Version: Synfig UI\n"
 "Report-Msgid-Bugs-To: http://www.synfig.org/issues/thebuggenie/synfig\n"
-"POT-Creation-Date: 2015-04-24 13:43+0600\n"
-"PO-Revision-Date: 2015-04-08 16:07+0000\n"
+"POT-Creation-Date: 2015-10-08 19:14+0600\n"
+"PO-Revision-Date: 2015-07-22 14:12+0000\n"
 "Last-Translator: morevnaproject <ksee.zelgadis at gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/synfig/"
 "language/zh_TW/)\n"
@@ -27,8 +27,9 @@ msgstr "文字"
 #: src/modules/lyr_std/import.cpp:61 src/modules/lyr_std/stroboscope.cpp:61
 #: src/modules/lyr_std/supersample.cpp:58 src/modules/lyr_std/timeloop.cpp:60
 #: src/modules/lyr_std/xorpattern.cpp:56 src/modules/mod_particle/plant.cpp:71
-#: src/synfig/layer_duplicate.cpp:57 src/synfig/layer_skeleton.cpp:55
-#: src/synfig/layer_sound.cpp:52 src/synfig/layer_switch.cpp:59
+#: src/synfig/layers/layer_duplicate.cpp:57
+#: src/synfig/layers/layer_skeleton.cpp:55
+#: src/synfig/layers/layer_sound.cpp:52 src/synfig/layers/layer_switch.cpp:59
 msgid "Other"
 msgstr "其他"
 
@@ -54,8 +55,9 @@ msgstr ""
 #: src/modules/mod_example/simplecircle.cpp:107
 #: src/modules/mod_geometry/checkerboard.cpp:146
 #: src/modules/mod_geometry/circle.cpp:146
-#: src/modules/mod_geometry/rectangle.cpp:138 src/synfig/layer_shape.cpp:1225
-#: src/synfig/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
+#: src/modules/mod_geometry/rectangle.cpp:138
+#: src/synfig/layers/layer_shape.cpp:1225
+#: src/synfig/layers/layer_solidcolor.cpp:114 src/synfig/paramdesc.cpp:83
 msgid "Color"
 msgstr "色彩"
 
@@ -73,7 +75,7 @@ msgstr "樣式"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:587
 #: src/modules/lyr_freetype/lyr_freetype.cpp:597
-#: src/synfig/valuenode_derivative.cpp:379
+#: src/synfig/valuenodes/valuenode_derivative.cpp:379
 msgid "Normal"
 msgstr "一般"
 
@@ -86,7 +88,7 @@ msgid "Italic"
 msgstr "斜體字"
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:593
-#: src/synfig/valuenode_composite.cpp:817
+#: src/synfig/valuenodes/valuenode_composite.cpp:817
 msgid "Weight"
 msgstr "Weight"
 
@@ -156,9 +158,12 @@ msgstr "文字方向"
 #: src/modules/mod_geometry/checkerboard.cpp:150
 #: src/modules/mod_geometry/circle.cpp:161
 #: src/modules/mod_gradient/curvegradient.cpp:550
-#: src/modules/mod_particle/plant.cpp:431 src/synfig/layer_pastecanvas.cpp:127
-#: src/synfig/layer_shape.cpp:1229 src/synfig/valuenode_bone.cpp:597
-#: src/synfig/valuenode_composite.cpp:692 src/synfig/valuenode_dynamic.cpp:241
+#: src/modules/mod_particle/plant.cpp:431
+#: src/synfig/layers/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_shape.cpp:1229
+#: src/synfig/valuenodes/valuenode_bone.cpp:597
+#: src/synfig/valuenodes/valuenode_composite.cpp:692
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:241
 msgid "Origin"
 msgstr "原點"
 
@@ -192,7 +197,7 @@ msgstr ""
 
 #: src/modules/lyr_freetype/lyr_freetype.cpp:649
 #: src/modules/lyr_std/shade.cpp:645 src/modules/mod_geometry/circle.cpp:165
-#: src/synfig/layer_shape.cpp:1232
+#: src/synfig/layers/layer_shape.cpp:1232
 msgid "Invert"
 msgstr "反轉"
 
@@ -237,27 +242,27 @@ msgid "Type of blur to use"
 msgstr "使用的模糊類型"
 
 #: src/modules/lyr_std/bevel.cpp:629 src/modules/lyr_std/shade.cpp:637
-#: src/modules/mod_filter/blur.cpp:422 src/synfig/layer_shape.cpp:1245
+#: src/modules/mod_filter/blur.cpp:422 src/synfig/layers/layer_shape.cpp:1245
 msgid "Box Blur"
 msgstr "箱型模糊"
 
 #: src/modules/lyr_std/bevel.cpp:630 src/modules/lyr_std/shade.cpp:638
-#: src/modules/mod_filter/blur.cpp:423 src/synfig/layer_shape.cpp:1246
+#: src/modules/mod_filter/blur.cpp:423 src/synfig/layers/layer_shape.cpp:1246
 msgid "Fast Gaussian Blur"
 msgstr "快速高斯模糊"
 
 #: src/modules/lyr_std/bevel.cpp:631 src/modules/lyr_std/shade.cpp:639
-#: src/modules/mod_filter/blur.cpp:424 src/synfig/layer_shape.cpp:1247
+#: src/modules/mod_filter/blur.cpp:424 src/synfig/layers/layer_shape.cpp:1247
 msgid "Cross-Hatch Blur"
 msgstr "交叉模糊"
 
 #: src/modules/lyr_std/bevel.cpp:632 src/modules/lyr_std/shade.cpp:640
-#: src/modules/mod_filter/blur.cpp:425 src/synfig/layer_shape.cpp:1248
+#: src/modules/mod_filter/blur.cpp:425 src/synfig/layers/layer_shape.cpp:1248
 msgid "Gaussian Blur"
 msgstr "高斯模糊"
 
 #: src/modules/lyr_std/bevel.cpp:633 src/modules/lyr_std/shade.cpp:641
-#: src/modules/mod_filter/blur.cpp:426 src/synfig/layer_shape.cpp:1249
+#: src/modules/mod_filter/blur.cpp:426 src/synfig/layers/layer_shape.cpp:1249
 msgid "Disc Blur"
 msgstr "圓盤模糊r"
 
@@ -344,6 +349,7 @@ msgstr "曲線彎曲"
 #: src/modules/lyr_std/sphere_distort.cpp:75
 #: src/modules/lyr_std/stretch.cpp:58 src/modules/lyr_std/twirl.cpp:57
 #: src/modules/lyr_std/warp.cpp:58 src/modules/mod_noise/distort.cpp:59
+#: src/synfig/layers/layer_skeletondeformation.cpp:62
 msgid "Distortions"
 msgstr "扭曲"
 
@@ -354,13 +360,14 @@ msgstr ""
 #: src/modules/lyr_std/curvewarp.cpp:402
 #: src/modules/lyr_std/supersample.cpp:339
 #: src/modules/mod_gradient/curvegradient.cpp:555
-#: src/synfig/valuenode_anglestring.cpp:174
-#: src/synfig/valuenode_composite.cpp:688
-#: src/synfig/valuenode_composite.cpp:726
-#: src/synfig/valuenode_intstring.cpp:170
-#: src/synfig/valuenode_realstring.cpp:175
-#: src/synfig/valuenode_repeat_gradient.cpp:213
-#: src/synfig/valuenode_stripes.cpp:204 src/tool/printing_functions.cpp:109
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:174
+#: src/synfig/valuenodes/valuenode_composite.cpp:688
+#: src/synfig/valuenodes/valuenode_composite.cpp:726
+#: src/synfig/valuenodes/valuenode_intstring.cpp:170
+#: src/synfig/valuenodes/valuenode_realstring.cpp:175
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:213
+#: src/synfig/valuenodes/valuenode_stripes.cpp:204
+#: src/tool/printing_functions.cpp:109
 msgid "Width"
 msgstr "寬度"
 
@@ -418,7 +425,7 @@ msgid "Filename seems to already be set to \"%s\" (%s)"
 msgstr ""
 
 #: src/modules/lyr_std/import.cpp:317 src/modules/mod_svg/layer_svg.cpp:107
-#: src/synfig/layer_sound.cpp:101
+#: src/synfig/layers/layer_sound.cpp:101
 msgid "Filename"
 msgstr "檔案名稱"
 
@@ -426,7 +433,8 @@ msgstr "檔案名稱"
 msgid "File to import"
 msgstr "用來匯入的檔案"
 
-#: src/modules/lyr_std/import.cpp:322 src/synfig/layer_pastecanvas.cpp:142
+#: src/modules/lyr_std/import.cpp:322
+#: src/synfig/layers/layer_pastecanvas.cpp:148
 msgid "Time Offset"
 msgstr "時間位移"
 
@@ -593,7 +601,8 @@ msgstr "外部位移"
 msgid "Scale Outside"
 msgstr "外部縮放"
 
-#: src/modules/lyr_std/rotate.cpp:56 src/synfig/valuenode_bonelink.cpp:223
+#: src/modules/lyr_std/rotate.cpp:56
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:223
 msgid "Rotate"
 msgstr "旋轉"
 
@@ -610,12 +619,13 @@ msgstr ""
 #: src/modules/lyr_std/rotate.cpp:122
 #: src/modules/lyr_std/sphere_distort.cpp:153
 #: src/modules/lyr_std/stretch.cpp:104 src/modules/lyr_std/zoom.cpp:99
-#: src/synfig/layer_composite.cpp:251 src/synfig/layer_skeleton.cpp:136
-#: src/synfig/valuenode_blinecalctangent.cpp:253
-#: src/synfig/valuenode_blinecalcvertex.cpp:211
-#: src/synfig/valuenode_blinecalcwidth.cpp:216
-#: src/synfig/valuenode_segcalctangent.cpp:161
-#: src/synfig/valuenode_segcalcvertex.cpp:159
+#: src/synfig/layers/layer_composite.cpp:251
+#: src/synfig/layers/layer_skeleton.cpp:136
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:253
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:211
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:216
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:161
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:159
 msgid "Amount"
 msgstr "總量"
 
@@ -637,7 +647,7 @@ msgid "Spherize"
 msgstr "球面"
 
 #: src/modules/lyr_std/sphere_distort.cpp:141
-#: src/synfig/valuenode_composite.cpp:722
+#: src/synfig/valuenodes/valuenode_composite.cpp:722
 msgid "Position"
 msgstr "位置"
 
@@ -652,7 +662,7 @@ msgstr ""
 #: src/modules/mod_gradient/radialgradient.cpp:123
 #: src/modules/mod_gradient/spiralgradient.cpp:123
 #: src/modules/mod_noise/valuenode_random.cpp:255
-#: src/synfig/valuenode_radialcomposite.cpp:272
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:272
 msgid "Radius"
 msgstr "半徑"
 
@@ -756,12 +766,13 @@ msgstr ""
 msgid "Avoid alpha artifacts when checked"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:177
-#: src/synfig/valuenode_timeloop.cpp:153
+#: src/modules/lyr_std/timeloop.cpp:59 src/synfig/valuenode.cpp:178
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:153
 msgid "Time Loop"
 msgstr "時間循環"
 
-#: src/modules/lyr_std/timeloop.cpp:133 src/synfig/valuenode_timeloop.cpp:179
+#: src/modules/lyr_std/timeloop.cpp:133
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:179
 msgid "Link Time"
 msgstr "連結時間"
 
@@ -769,16 +780,19 @@ msgstr "連結時間"
 msgid "Start time of the loop for the cycled context"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:139 src/synfig/valuenode_timeloop.cpp:184
+#: src/modules/lyr_std/timeloop.cpp:139
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:184
 msgid "Local Time"
 msgstr "本地時間"
 
-#: src/modules/lyr_std/timeloop.cpp:140 src/synfig/valuenode_timeloop.cpp:185
+#: src/modules/lyr_std/timeloop.cpp:140
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:185
 msgid "The time when the resulted loop starts"
 msgstr ""
 
-#: src/modules/lyr_std/timeloop.cpp:145 src/synfig/valuenode_step.cpp:197
-#: src/synfig/valuenode_timeloop.cpp:189
+#: src/modules/lyr_std/timeloop.cpp:145
+#: src/synfig/valuenodes/valuenode_step.cpp:197
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:189
 msgid "Duration"
 msgstr "持續時間"
 
@@ -802,7 +816,8 @@ msgstr ""
 msgid "When checked, loops are mirrored centered at Local Time"
 msgstr ""
 
-#: src/modules/lyr_std/translate.cpp:55 src/synfig/valuenode_bonelink.cpp:218
+#: src/modules/lyr_std/translate.cpp:55
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:218
 msgid "Translate"
 msgstr "移動"
 
@@ -911,11 +926,12 @@ msgstr ""
 msgid "Size of the pattern"
 msgstr ""
 
-#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:154
-#: src/synfig/valuenode_blinecalctangent.cpp:263
-#: src/synfig/valuenode_blinecalcwidth.cpp:221
-#: src/synfig/valuenode_composite.cpp:808 src/synfig/valuenode_exp.cpp:155
-#: src/synfig/valuenode_scale.cpp:225
+#: src/modules/lyr_std/zoom.cpp:52 src/synfig/valuenode.cpp:155
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:263
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:221
+#: src/synfig/valuenodes/valuenode_composite.cpp:808
+#: src/synfig/valuenodes/valuenode_exp.cpp:155
+#: src/synfig/valuenodes/valuenode_scale.cpp:225
 msgid "Scale"
 msgstr "縮放"
 
@@ -1005,13 +1021,14 @@ msgstr "取樣"
 #: src/modules/mod_example/simplecircle.cpp:108
 #: src/modules/mod_geometry/circle.cpp:147
 #: src/modules/mod_geometry/rectangle.cpp:139
-#: src/synfig/layer_solidcolor.cpp:115
+#: src/synfig/layers/layer_solidcolor.cpp:115
 msgid "Fill color of the layer"
 msgstr "填滿顏色的圖層"
 
 #: src/modules/mod_example/filledrect.cpp:136
 #: src/modules/mod_geometry/rectangle.cpp:143
 #: src/modules/mod_gradient/lineargradient.cpp:190
+#: src/synfig/layers/layer_skeletondeformation.cpp:104
 msgid "Point 1"
 msgstr "點 1"
 
@@ -1023,6 +1040,7 @@ msgstr "矩型第一個座標"
 #: src/modules/mod_example/filledrect.cpp:142
 #: src/modules/mod_geometry/rectangle.cpp:149
 #: src/modules/mod_gradient/lineargradient.cpp:195
+#: src/synfig/layers/layer_skeletondeformation.cpp:110
 msgid "Point 2"
 msgstr "點 2"
 
@@ -1062,9 +1080,9 @@ msgstr "金屬球"
 #: src/modules/mod_gradient/radialgradient.cpp:113
 #: src/modules/mod_gradient/spiralgradient.cpp:113
 #: src/modules/mod_noise/noise.cpp:268 src/modules/mod_particle/plant.cpp:436
-#: src/synfig/valuenode_gradientcolor.cpp:158
-#: src/synfig/valuenode_gradientrotate.cpp:164
-#: src/synfig/valuenode_repeat_gradient.cpp:203
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:158
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:164
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:203
 msgid "Gradient"
 msgstr "漸層"
 
@@ -1128,7 +1146,7 @@ msgid "Blur"
 msgstr "模糊"
 
 #: src/modules/mod_filter/blur.cpp:70 src/modules/mod_filter/radialblur.cpp:57
-#: src/synfig/layer_motionblur.cpp:57
+#: src/synfig/layers/layer_motionblur.cpp:57
 msgid "Blurs"
 msgstr "模糊"
 
@@ -1156,7 +1174,8 @@ msgstr ""
 msgid "Exposure Adjust"
 msgstr ""
 
-#: src/modules/mod_filter/colorcorrect.cpp:233 src/synfig/layer_bitmap.cpp:176
+#: src/modules/mod_filter/colorcorrect.cpp:233
+#: src/synfig/layers/layer_bitmap.cpp:176
 msgid "Gamma Adjustment"
 msgstr ""
 
@@ -1256,7 +1275,8 @@ msgstr "進階的外框"
 #: src/modules/mod_geometry/outline.cpp:73
 #: src/modules/mod_geometry/rectangle.cpp:60
 #: src/modules/mod_geometry/region.cpp:65 src/modules/mod_geometry/star.cpp:64
-#: src/synfig/layer_polygon.cpp:61 src/synfig/layer_solidcolor.cpp:57
+#: src/synfig/layers/layer_polygon.cpp:61
+#: src/synfig/layers/layer_solidcolor.cpp:57
 msgid "Geometry"
 msgstr "幾何"
 
@@ -1302,37 +1322,37 @@ msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1152
 #: src/modules/mod_geometry/advanced_outline.cpp:1161
-#: src/synfig/valuenode_composite.cpp:734
-#: src/synfig/valuenode_composite.cpp:744
-#: src/synfig/valuenode_composite.cpp:776
-#: src/synfig/valuenode_composite.cpp:785
+#: src/synfig/valuenodes/valuenode_composite.cpp:734
+#: src/synfig/valuenodes/valuenode_composite.cpp:744
+#: src/synfig/valuenodes/valuenode_composite.cpp:776
+#: src/synfig/valuenodes/valuenode_composite.cpp:785
 msgid "Rounded Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1153
 #: src/modules/mod_geometry/advanced_outline.cpp:1162
-#: src/synfig/valuenode_composite.cpp:735
-#: src/synfig/valuenode_composite.cpp:745
-#: src/synfig/valuenode_composite.cpp:777
-#: src/synfig/valuenode_composite.cpp:786
+#: src/synfig/valuenodes/valuenode_composite.cpp:735
+#: src/synfig/valuenodes/valuenode_composite.cpp:745
+#: src/synfig/valuenodes/valuenode_composite.cpp:777
+#: src/synfig/valuenodes/valuenode_composite.cpp:786
 msgid "Squared Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1154
 #: src/modules/mod_geometry/advanced_outline.cpp:1163
-#: src/synfig/valuenode_composite.cpp:736
-#: src/synfig/valuenode_composite.cpp:746
-#: src/synfig/valuenode_composite.cpp:778
-#: src/synfig/valuenode_composite.cpp:787
+#: src/synfig/valuenodes/valuenode_composite.cpp:736
+#: src/synfig/valuenodes/valuenode_composite.cpp:746
+#: src/synfig/valuenodes/valuenode_composite.cpp:778
+#: src/synfig/valuenodes/valuenode_composite.cpp:787
 msgid "Peak Stop"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1155
 #: src/modules/mod_geometry/advanced_outline.cpp:1164
-#: src/synfig/valuenode_composite.cpp:737
-#: src/synfig/valuenode_composite.cpp:747
-#: src/synfig/valuenode_composite.cpp:779
-#: src/synfig/valuenode_composite.cpp:788
+#: src/synfig/valuenodes/valuenode_composite.cpp:737
+#: src/synfig/valuenodes/valuenode_composite.cpp:747
+#: src/synfig/valuenodes/valuenode_composite.cpp:779
+#: src/synfig/valuenodes/valuenode_composite.cpp:788
 msgid "Flat Stop"
 msgstr ""
 
@@ -1366,14 +1386,14 @@ msgid "Smoothness"
 msgstr "平滑度"
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1176
-msgid "Determines the interpolation between withpoints. (0) Linear (1) Smooth"
+msgid "Determines the interpolation between widthpoints. (0) Linear (1) Smooth"
 msgstr ""
 
 #: src/modules/mod_geometry/advanced_outline.cpp:1179
 #: src/modules/mod_geometry/outline.cpp:869
-#: src/synfig/valuenode_blinecalctangent.cpp:273
-#: src/synfig/valuenode_blinecalcvertex.cpp:216
-#: src/synfig/valuenode_blinecalcwidth.cpp:226
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:273
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:216
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:226
 msgid "Homogeneous"
 msgstr "同質"
 
@@ -1441,7 +1461,8 @@ msgstr "圓"
 msgid "Radius of the circle"
 msgstr "圓的半徑"
 
-#: src/modules/mod_geometry/circle.cpp:156 src/synfig/layer_shape.cpp:1238
+#: src/modules/mod_geometry/circle.cpp:156
+#: src/synfig/layers/layer_shape.cpp:1238
 msgid "Feather"
 msgstr "邊緣模糊"
 
@@ -1464,8 +1485,9 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:173
 #: src/modules/mod_noise/distort.cpp:239 src/modules/mod_noise/noise.cpp:284
 #: src/modules/mod_noise/valuenode_random.cpp:274
-#: src/synfig/layer_bitmap.cpp:169 src/synfig/layer_motionblur.cpp:149
-#: src/synfig/valuenode.cpp:150 src/synfig/valuenode_linear.cpp:154
+#: src/synfig/layers/layer_bitmap.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:149 src/synfig/valuenode.cpp:151
+#: src/synfig/valuenodes/valuenode_linear.cpp:154
 msgid "Linear"
 msgstr "線性"
 
@@ -1484,7 +1506,7 @@ msgstr ""
 #: src/modules/mod_geometry/circle.cpp:177
 #: src/modules/mod_noise/distort.cpp:240 src/modules/mod_noise/noise.cpp:285
 #: src/modules/mod_noise/valuenode_random.cpp:275
-#: src/synfig/layer_bitmap.cpp:170
+#: src/synfig/layers/layer_bitmap.cpp:170
 msgid "Cosine"
 msgstr "餘弦"
 
@@ -1564,9 +1586,11 @@ msgstr ""
 #: src/modules/mod_geometry/star.cpp:184
 #: src/modules/mod_gradient/conicalgradient.cpp:119
 #: src/modules/mod_gradient/spiralgradient.cpp:130
-#: src/synfig/valuenode_anglestring.cpp:169 src/synfig/valuenode_bone.cpp:602
-#: src/synfig/valuenode_composite.cpp:800 src/synfig/valuenode_cos.cpp:155
-#: src/synfig/valuenode_sine.cpp:154
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:169
+#: src/synfig/valuenodes/valuenode_bone.cpp:602
+#: src/synfig/valuenodes/valuenode_composite.cpp:800
+#: src/synfig/valuenodes/valuenode_cos.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:154
 msgid "Angle"
 msgstr "角度"
 
@@ -1652,10 +1676,10 @@ msgstr ""
 #: src/modules/mod_gradient/curvegradient.cpp:569
 #: src/modules/mod_gradient/lineargradient.cpp:203
 #: src/modules/mod_gradient/radialgradient.cpp:130
-#: src/synfig/valuenode_blinecalctangent.cpp:248
-#: src/synfig/valuenode_blinecalcvertex.cpp:206
-#: src/synfig/valuenode_blinecalcwidth.cpp:211
-#: src/synfig/valuenode_gradientcolor.cpp:168
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:248
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:206
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:211
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:168
 msgid "Loop"
 msgstr "封閉"
 
@@ -1798,32 +1822,32 @@ msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:235 src/modules/mod_noise/noise.cpp:280
 #: src/modules/mod_noise/valuenode_random.cpp:270
-#: src/synfig/layer_bitmap.cpp:165
+#: src/synfig/layers/layer_bitmap.cpp:165
 msgid "Interpolation"
 msgstr "內插模式"
 
 #: src/modules/mod_noise/distort.cpp:236 src/modules/mod_noise/noise.cpp:281
-#: src/synfig/layer_bitmap.cpp:166
+#: src/synfig/layers/layer_bitmap.cpp:166
 msgid "What type of interpolation to use"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:238 src/modules/mod_noise/noise.cpp:283
-#: src/synfig/layer_bitmap.cpp:168
+#: src/synfig/layers/layer_bitmap.cpp:168
 msgid "Nearest Neighbor"
 msgstr ""
 
 #: src/modules/mod_noise/distort.cpp:241 src/modules/mod_noise/noise.cpp:286
-#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:160
-#: src/synfig/valuenode_bline.cpp:1010
-#: src/synfig/valuenode_blinecalctangent.cpp:243
-#: src/synfig/valuenode_blinecalcvertex.cpp:201
-#: src/synfig/valuenode_blinecalcwidth.cpp:206
+#: src/modules/mod_noise/valuenode_random.cpp:276 src/synfig/valuenode.cpp:161
+#: src/synfig/valuenodes/valuenode_bline.cpp:1010
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:243
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:201
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:206
 msgid "Spline"
 msgstr "曲線"
 
 #: src/modules/mod_noise/distort.cpp:242 src/modules/mod_noise/noise.cpp:287
 #: src/modules/mod_noise/valuenode_random.cpp:277
-#: src/synfig/layer_bitmap.cpp:171
+#: src/synfig/layers/layer_bitmap.cpp:171
 msgid "Cubic"
 msgstr "立方體"
 
@@ -1881,13 +1905,20 @@ msgid "When checked the gradient is supersampled"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:250
-#: src/synfig/valuenode_boneinfluence.cpp:227
-#: src/synfig/valuenode_derivative.cpp:367 src/synfig/valuenode_greyed.cpp:96
-#: src/synfig/valuenode_integer.cpp:191 src/synfig/valuenode_log.cpp:159
-#: src/synfig/valuenode_not.cpp:141 src/synfig/valuenode_range.cpp:289
-#: src/synfig/valuenode_real.cpp:179 src/synfig/valuenode_reciprocal.cpp:165
-#: src/synfig/valuenode_reference.cpp:143 src/synfig/valuenode_scale.cpp:249
-#: src/synfig/valuenode_step.cpp:192 src/synfig/valuenode_timeloop.cpp:174
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:227
+#: src/synfig/valuenodes/valuenode_derivative.cpp:367
+#: src/synfig/valuenodes/valuenode_greyed.cpp:96
+#: src/synfig/valuenodes/valuenode_integer.cpp:191
+#: src/synfig/valuenodes/valuenode_log.cpp:159
+#: src/synfig/valuenodes/valuenode_not.cpp:141
+#: src/synfig/valuenodes/valuenode_range.cpp:289
+#: src/synfig/valuenodes/valuenode_real.cpp:185
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:165
+#: src/synfig/valuenodes/valuenode_reference.cpp:143
+#: src/synfig/valuenodes/valuenode_reverse.cpp:307
+#: src/synfig/valuenodes/valuenode_scale.cpp:249
+#: src/synfig/valuenodes/valuenode_step.cpp:192
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:174
 msgid "Link"
 msgstr "連結"
 
@@ -1909,6 +1940,7 @@ msgid "Seeds the random number generator"
 msgstr ""
 
 #: src/modules/mod_noise/valuenode_random.cpp:265
+#: src/synfig/layers/layer_pastecanvas.cpp:143
 msgid "Speed"
 msgstr ""
 
@@ -1993,8 +2025,9 @@ msgid ""
 "size, and an alpha of 1.0 is used when rendering"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:473
-#: src/synfig/valuenode_blinereversetangent.cpp:169
+#: src/modules/mod_particle/plant.cpp:473 src/synfig/valuenode.cpp:221
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:169
+#: src/synfig/valuenodes/valuenode_reverse.cpp:282
 msgid "Reverse"
 msgstr ""
 
@@ -2002,8 +2035,9 @@ msgstr ""
 msgid "If enabled, render the plant in the opposite direction"
 msgstr ""
 
-#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:181
-#: src/synfig/valuenode_duplicate.cpp:204 src/synfig/valuenode_step.cpp:137
+#: src/modules/mod_particle/plant.cpp:478 src/synfig/valuenode.cpp:182
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:204
+#: src/synfig/valuenodes/valuenode_step.cpp:137
 msgid "Step"
 msgstr "步進"
 
@@ -2214,7 +2248,7 @@ msgstr ""
 msgid "Importer::open(): Unknown file type -- "
 msgstr ""
 
-#: src/synfig/layer.cpp:736 src/synfig/layer_composite.cpp:132
+#: src/synfig/layer.cpp:736 src/synfig/layers/layer_composite.cpp:132
 msgid "Unable to create surface target"
 msgstr ""
 
@@ -2226,252 +2260,296 @@ msgstr "Z 深度"
 msgid "Modifies the position of the layer in the layer stack"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:155
+#: src/synfig/layers/layer_bitmap.cpp:155
 msgid "Top-Left"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:156
+#: src/synfig/layers/layer_bitmap.cpp:156
 msgid "Upper left-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:160
+#: src/synfig/layers/layer_bitmap.cpp:160
 msgid "Bottom-Right"
 msgstr ""
 
-#: src/synfig/layer_bitmap.cpp:161
+#: src/synfig/layers/layer_bitmap.cpp:161
 msgid "Lower right-hand Corner of image"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:252 src/synfig/layer_skeleton.cpp:137
+#: src/synfig/layers/layer_composite.cpp:252
+#: src/synfig/layers/layer_skeleton.cpp:137
 msgid "Alpha channel of the layer"
 msgstr ""
 
-#: src/synfig/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
+#: src/synfig/layers/layer_composite.cpp:255 src/synfig/paramdesc.cpp:66
 msgid "Blend Method"
 msgstr "混合方式"
 
-#: src/synfig/layer_composite.cpp:256
+#: src/synfig/layers/layer_composite.cpp:256
 msgid "The blending method used to composite on the layers below"
 msgstr ""
 
-#: src/synfig/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:179
-#: src/synfig/valuenode_duplicate.cpp:175
+#: src/synfig/layers/layer_duplicate.cpp:56 src/synfig/valuenode.cpp:180
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:175
 msgid "Duplicate"
 msgstr "重製"
 
-#: src/synfig/layer_duplicate.cpp:151
-#: src/synfig/valuenode_gradientcolor.cpp:163
+#: src/synfig/layers/layer_duplicate.cpp:151
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:163
 msgid "Index"
 msgstr "索引"
 
-#: src/synfig/layer_duplicate.cpp:152
+#: src/synfig/layers/layer_duplicate.cpp:152
 msgid "Copy Index"
 msgstr "複製索引"
 
-#: src/synfig/layer_mime.cpp:86
+#: src/synfig/layers/layer_mime.cpp:86
 msgid "[MIME]"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:56
+#: src/synfig/layers/layer_motionblur.cpp:56
 msgid "Motion Blur"
 msgstr "動態模糊"
 
-#: src/synfig/layer_motionblur.cpp:135
+#: src/synfig/layers/layer_motionblur.cpp:135
 msgid "Aperture"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:136
+#: src/synfig/layers/layer_motionblur.cpp:136
 msgid "Shutter Time"
 msgstr "快門時間"
 
-#: src/synfig/layer_motionblur.cpp:140
+#: src/synfig/layers/layer_motionblur.cpp:140
 msgid "Subsamples Factor"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:141
+#: src/synfig/layers/layer_motionblur.cpp:141
 msgid "Multiplies The Number Of Subsamples Rendered"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:145
+#: src/synfig/layers/layer_motionblur.cpp:145
 msgid "Subsampling Type"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:146
+#: src/synfig/layers/layer_motionblur.cpp:146
 msgid "Curve Type For Weighting Subsamples"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:148 src/synfig/valuenode_const.cpp:169
+#: src/synfig/layers/layer_motionblur.cpp:148
+#: src/synfig/valuenodes/valuenode_const.cpp:169
 msgid "Constant"
 msgstr "固定"
 
-#: src/synfig/layer_motionblur.cpp:150
+#: src/synfig/layers/layer_motionblur.cpp:150
 msgid "Hyperbolic"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:154
+#: src/synfig/layers/layer_motionblur.cpp:154
 msgid "Subsample Start Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:155
+#: src/synfig/layers/layer_motionblur.cpp:155
 msgid "Relative Amount Of The First Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:159
+#: src/synfig/layers/layer_motionblur.cpp:159
 msgid "Subsample End Amount"
 msgstr ""
 
-#: src/synfig/layer_motionblur.cpp:160
+#: src/synfig/layers/layer_motionblur.cpp:160
 msgid "Relative Amount Of The Last Subsample, For Linear Weighting"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:128
+#: src/synfig/layers/layer_pastecanvas.cpp:129
 msgid "Position offset"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:132
+#: src/synfig/layers/layer_pastecanvas.cpp:133
 msgid "Transformation"
 msgstr "變形"
 
-#: src/synfig/layer_pastecanvas.cpp:133
+#: src/synfig/layers/layer_pastecanvas.cpp:134
 msgid "Position, rotation, skew and scale"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:137
+#: src/synfig/layers/layer_pastecanvas.cpp:138
 msgid "Canvas"
 msgstr "畫布"
 
-#: src/synfig/layer_pastecanvas.cpp:138
+#: src/synfig/layers/layer_pastecanvas.cpp:139
 msgid "Group content"
 msgstr "群組內容"
 
-#: src/synfig/layer_pastecanvas.cpp:143
+#: src/synfig/layers/layer_pastecanvas.cpp:144
+msgid "Multiplier to speed up, slow down, freeze, or reverse time"
+msgstr ""
+
+#: src/synfig/layers/layer_pastecanvas.cpp:149
 msgid "Time Offset to apply to the context"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:147
+#: src/synfig/layers/layer_pastecanvas.cpp:153
 msgid "Lock Selection"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:148
+#: src/synfig/layers/layer_pastecanvas.cpp:154
 msgid "When checked prevents to select the children using the mouse click"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:153
+#: src/synfig/layers/layer_pastecanvas.cpp:159
 msgid "Outline Grow"
 msgstr "外光暈"
 
-#: src/synfig/layer_pastecanvas.cpp:154
+#: src/synfig/layers/layer_pastecanvas.cpp:160
 msgid "Exponential value to grow children Outline layers width"
 msgstr ""
 
-#: src/synfig/layer_pastecanvas.cpp:168
+#: src/synfig/layers/layer_pastecanvas.cpp:174
 msgid "Current Time"
 msgstr "目前時間"
 
-#: src/synfig/layer_polygon.cpp:60
+#: src/synfig/layers/layer_polygon.cpp:60
 msgid "Polygon"
 msgstr "多邊形"
 
-#: src/synfig/layer_polygon.cpp:187
+#: src/synfig/layers/layer_polygon.cpp:187
 msgid "Vertices List"
 msgstr "頂點清單"
 
-#: src/synfig/layer_polygon.cpp:188
+#: src/synfig/layers/layer_polygon.cpp:188
 msgid "Define the corners of the polygon"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:66
+#: src/synfig/layers/layer_shape.cpp:66
 msgid "Shape"
 msgstr "造型"
 
-#: src/synfig/layer_shape.cpp:67
+#: src/synfig/layers/layer_shape.cpp:67
 msgid "Internal"
 msgstr "內部"
 
-#: src/synfig/layer_shape.cpp:1226
+#: src/synfig/layers/layer_shape.cpp:1226
 msgid "Layer_Shape Color"
 msgstr ""
 
-#: src/synfig/layer_shape.cpp:1235
+#: src/synfig/layers/layer_shape.cpp:1235
 msgid "Antialiasing"
 msgstr "反鋸齒"
 
-#: src/synfig/layer_shape.cpp:1242
+#: src/synfig/layers/layer_shape.cpp:1242
 msgid "Type of Feather"
 msgstr "邊緣模糊類型"
 
-#: src/synfig/layer_shape.cpp:1243
+#: src/synfig/layers/layer_shape.cpp:1243
 msgid "Type of feathering to use"
 msgstr "使用的邊緣模糊類型"
 
-#: src/synfig/layer_shape.cpp:1252
+#: src/synfig/layers/layer_shape.cpp:1252
 msgid "Winding Style"
 msgstr "區折樣式"
 
-#: src/synfig/layer_shape.cpp:1253
+#: src/synfig/layers/layer_shape.cpp:1253
 msgid "Winding style to use"
 msgstr "使用的區折樣式"
 
-#: src/synfig/layer_shape.cpp:1255
+#: src/synfig/layers/layer_shape.cpp:1255
 msgid "Non Zero"
 msgstr "非零"
 
-#: src/synfig/layer_shape.cpp:1256
+#: src/synfig/layers/layer_shape.cpp:1256
 msgid "Even/Odd"
 msgstr "奇/偶"
 
-#: src/synfig/layer_skeleton.cpp:54
+#: src/synfig/layers/layer_skeleton.cpp:54
 msgid "Skeleton"
 msgstr "骨架"
 
-#: src/synfig/layer_skeleton.cpp:142 src/synfig/valuenode_bone.cpp:587
+#: src/synfig/layers/layer_skeleton.cpp:142
+#: src/synfig/valuenodes/valuenode_bone.cpp:587
 msgid "Name"
 msgstr "名稱"
 
-#: src/synfig/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeleton.cpp:145
+#: src/synfig/layers/layer_skeletondeformation.cpp:98
 msgid "Bones"
 msgstr "骨架"
 
-#: src/synfig/layer_solidcolor.cpp:56
+#: src/synfig/layers/layer_skeletondeformation.cpp:61
+#: src/synfig/layers/layer_skeletondeformation.cpp:89
+#, fuzzy
+msgid "Skeleton Deformation"
+msgstr "變形"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:99
+msgid "List of bones"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:106
+#, fuzzy
+msgid "First corner of the bounds rectangle"
+msgstr "矩型第一個座標"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:111
+#, fuzzy
+msgid "Second corner of the bounds rectangle"
+msgstr "矩型第二個座標"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:115
+#, fuzzy
+msgid "Horizontal subdivisions"
+msgstr "Horizontal Spacing"
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:116
+msgid "Count of horizontal subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:120
+msgid "Vertical subdivisions"
+msgstr ""
+
+#: src/synfig/layers/layer_skeletondeformation.cpp:121
+msgid "Count of vertical subdivisions of the transformation grid"
+msgstr ""
+
+#: src/synfig/layers/layer_solidcolor.cpp:56
 msgid "Solid Color"
 msgstr "實體顏色"
 
-#: src/synfig/layer_sound.cpp:51
+#: src/synfig/layers/layer_sound.cpp:51
 msgid "Sound"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:102
-#, fuzzy
+#: src/synfig/layers/layer_sound.cpp:102
 msgid "Path to sound file"
-msgstr "無法開啟檔案"
+msgstr ""
 
-#: src/synfig/layer_sound.cpp:108
+#: src/synfig/layers/layer_sound.cpp:108
 msgid "Delay"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:109
+#: src/synfig/layers/layer_sound.cpp:109
 msgid "Delay before play"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:114
+#: src/synfig/layers/layer_sound.cpp:114
 msgid "Volume"
 msgstr ""
 
-#: src/synfig/layer_sound.cpp:115
+#: src/synfig/layers/layer_sound.cpp:115
 msgid "Volume of sound"
 msgstr ""
 
-#: src/synfig/layer_switch.cpp:58 src/synfig/layer_switch.cpp:82
-#: src/synfig/valuenode.cpp:173 src/synfig/valuenode_switch.cpp:133
-#: src/synfig/valuenode_switch.cpp:163
+#: src/synfig/layers/layer_switch.cpp:58 src/synfig/layers/layer_switch.cpp:82
+#: src/synfig/valuenode.cpp:174 src/synfig/valuenodes/valuenode_switch.cpp:133
+#: src/synfig/valuenodes/valuenode_switch.cpp:163
 msgid "Switch"
 msgstr "交換器"
 
-#: src/synfig/layer_switch.cpp:91
+#: src/synfig/layers/layer_switch.cpp:91
 msgid "Active Layer Name"
 msgstr "激活圖層名稱"
 
-#: src/synfig/layer_switch.cpp:92
+#: src/synfig/layers/layer_switch.cpp:92
 msgid "Only layer with specified name are visible"
 msgstr ""
 
@@ -2767,7 +2845,7 @@ msgstr ""
 msgid "Canvas '%s' has undefined %s: %s"
 msgstr ""
 
-#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:386
+#: src/synfig/loadcanvas.cpp:3390 src/synfig/valuenode.cpp:389
 msgid "ValueNode"
 msgstr ""
 
@@ -2969,8 +3047,8 @@ msgstr ""
 msgid "%s does not appear to be a supported palette file"
 msgstr ""
 
-#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:151
-#: src/synfig/valuenode_composite.cpp:600
+#: src/synfig/paramdesc.cpp:68 src/synfig/valuenode.cpp:152
+#: src/synfig/valuenodes/valuenode_composite.cpp:600
 msgid "Composite"
 msgstr "合成"
 
@@ -3010,13 +3088,13 @@ msgstr "相乘"
 msgid "Divide"
 msgstr "相除"
 
-#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:168
-#: src/synfig/valuenode_add.cpp:199
+#: src/synfig/paramdesc.cpp:78 src/synfig/valuenode.cpp:169
+#: src/synfig/valuenodes/valuenode_add.cpp:211
 msgid "Add"
 msgstr "增加"
 
-#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:158
-#: src/synfig/valuenode_subtract.cpp:203
+#: src/synfig/paramdesc.cpp:79 src/synfig/valuenode.cpp:159
+#: src/synfig/valuenodes/valuenode_subtract.cpp:203
 msgid "Subtract"
 msgstr "減去"
 
@@ -3032,12 +3110,14 @@ msgstr "變亮"
 msgid "Darken"
 msgstr "變暗"
 
-#: src/synfig/paramdesc.cpp:84 src/synfig/valuenode_radialcomposite.cpp:261
+#: src/synfig/paramdesc.cpp:84
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:261
 msgid "Hue"
 msgstr "色調"
 
-#: src/synfig/paramdesc.cpp:85 src/synfig/valuenode_radialcomposite.cpp:258
-#: src/synfig/valuenode_radialcomposite.cpp:264
+#: src/synfig/paramdesc.cpp:85
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:258
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:264
 msgid "Saturation"
 msgstr "飽和度"
 
@@ -3151,230 +3231,260 @@ msgid ""
 "SECONDS"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:152 src/synfig/valuenode_radialcomposite.cpp:232
+#: src/synfig/valuenode.cpp:153
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:232
 msgid "Radial Composite"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:153
-#: src/synfig/valuenode_blinereversetangent.cpp:164
-#: src/synfig/valuenode_reference.cpp:123
+#: src/synfig/valuenode.cpp:154
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:164
+#: src/synfig/valuenodes/valuenode_reference.cpp:123
 msgid "Reference"
 msgstr "參考手冊"
 
-#: src/synfig/valuenode.cpp:155 src/synfig/valuenode_segcalctangent.cpp:106
+#: src/synfig/valuenode.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:106
 msgid "Segment Tangent"
 msgstr "線段切線"
 
-#: src/synfig/valuenode.cpp:156 src/synfig/valuenode_segcalcvertex.cpp:104
+#: src/synfig/valuenode.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:104
 msgid "Segment Vertex"
 msgstr "線段頂點"
 
-#: src/synfig/valuenode.cpp:157 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_stripes.cpp:171
+#: src/synfig/valuenode.cpp:158 src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_stripes.cpp:171
 msgid "Stripes"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:159 src/synfig/valuenode_twotone.cpp:135
+#: src/synfig/valuenode.cpp:160
+#: src/synfig/valuenodes/valuenode_twotone.cpp:135
 msgid "Two-Tone"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:161 src/synfig/valuenode_dynamiclist.cpp:770
+#: src/synfig/valuenode.cpp:162
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:770
 msgid "Dynamic List"
 msgstr "動態清單"
 
-#: src/synfig/valuenode.cpp:162 src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_gradientrotate.cpp:146
+#: src/synfig/valuenode.cpp:163
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:146
 msgid "Gradient Rotate"
 msgstr "漸層旋轉"
 
-#: src/synfig/valuenode.cpp:163 src/synfig/valuenode_sine.cpp:110
+#: src/synfig/valuenode.cpp:164 src/synfig/valuenodes/valuenode_sine.cpp:110
 msgid "Sine"
 msgstr "正弦"
 
-#: src/synfig/valuenode.cpp:165 src/synfig/valuenode_timedswap.cpp:233
+#: src/synfig/valuenode.cpp:166
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:233
 msgid "Timed Swap"
 msgstr "定時交換"
 
-#: src/synfig/valuenode.cpp:166 src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_repeat_gradient.cpp:185
+#: src/synfig/valuenode.cpp:167
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:185
 msgid "Repeat Gradient"
 msgstr "重複漸層"
 
-#: src/synfig/valuenode.cpp:167 src/synfig/valuenode_exp.cpp:106
+#: src/synfig/valuenode.cpp:168 src/synfig/valuenodes/valuenode_exp.cpp:106
 msgid "Exponential"
 msgstr "指數"
 
-#: src/synfig/valuenode.cpp:169 src/synfig/valuenode_blinecalctangent.cpp:186
+#: src/synfig/valuenode.cpp:170
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:186
 msgid "Spline Tangent"
 msgstr "曲線切線"
 
-#: src/synfig/valuenode.cpp:170 src/synfig/valuenode_blinecalcvertex.cpp:152
+#: src/synfig/valuenode.cpp:171
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:152
 msgid "Spline Vertex"
 msgstr "曲線頂點"
 
-#: src/synfig/valuenode.cpp:171 src/synfig/valuenode_range.cpp:258
+#: src/synfig/valuenode.cpp:172 src/synfig/valuenodes/valuenode_range.cpp:258
 msgid "Range"
 msgstr "範圍"
 
-#: src/synfig/valuenode.cpp:174 src/synfig/valuenode_cos.cpp:109
+#: src/synfig/valuenode.cpp:175 src/synfig/valuenodes/valuenode_cos.cpp:109
 msgid "Cos"
 msgstr "餘弦"
 
-#: src/synfig/valuenode.cpp:175 src/synfig/valuenode_atan2.cpp:107
+#: src/synfig/valuenode.cpp:176 src/synfig/valuenodes/valuenode_atan2.cpp:107
 msgid "aTan2"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:176
-#: src/synfig/valuenode_blinereversetangent.cpp:119
+#: src/synfig/valuenode.cpp:177
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:119
 msgid "Reverse Tangent"
 msgstr "反轉切線"
 
-#: src/synfig/valuenode.cpp:178 src/synfig/valuenode_reciprocal.cpp:147
+#: src/synfig/valuenode.cpp:179
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:147
 msgid "Reciprocal"
 msgstr "倒數"
 
-#: src/synfig/valuenode.cpp:180 src/synfig/valuenode_integer.cpp:169
+#: src/synfig/valuenode.cpp:181
+#: src/synfig/valuenodes/valuenode_integer.cpp:169
 msgid "Integer"
 msgstr "整數"
 
-#: src/synfig/valuenode.cpp:182 src/synfig/valuenode_blinecalcwidth.cpp:155
+#: src/synfig/valuenode.cpp:183
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:155
 msgid "Spline Width"
 msgstr "曲線寬度"
 
-#: src/synfig/valuenode.cpp:184 src/synfig/valuenode_vectorangle.cpp:124
+#: src/synfig/valuenode.cpp:185
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:124
 msgid "Vector Angle"
 msgstr "向量角度"
 
-#: src/synfig/valuenode.cpp:185 src/synfig/valuenode_vectorlength.cpp:123
+#: src/synfig/valuenode.cpp:186
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:123
 msgid "Vector Length"
 msgstr "向量長度"
 
-#: src/synfig/valuenode.cpp:186 src/synfig/valuenode_vectorx.cpp:123
+#: src/synfig/valuenode.cpp:187
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:123
 msgid "Vector X"
 msgstr "向量 X"
 
-#: src/synfig/valuenode.cpp:187 src/synfig/valuenode_vectory.cpp:123
+#: src/synfig/valuenode.cpp:188
+#: src/synfig/valuenodes/valuenode_vectory.cpp:123
 msgid "Vector Y"
 msgstr "向量 Y"
 
-#: src/synfig/valuenode.cpp:188 src/synfig/valuenode_gradientcolor.cpp:140
+#: src/synfig/valuenode.cpp:189
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:140
 msgid "Gradient Color"
 msgstr "漸層顏色"
 
-#: src/synfig/valuenode.cpp:189 src/synfig/valuenode_dotproduct.cpp:120
+#: src/synfig/valuenode.cpp:190
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:120
 msgid "Dot Product"
 msgstr "點乘積"
 
-#: src/synfig/valuenode.cpp:190 src/synfig/valuenode_timestring.cpp:112
+#: src/synfig/valuenode.cpp:191
+#: src/synfig/valuenodes/valuenode_timestring.cpp:112
 msgid "Time String"
 msgstr "時間字串"
 
-#: src/synfig/valuenode.cpp:191 src/synfig/valuenode_real.cpp:158
-#: src/synfig/valuenode_realstring.cpp:170
+#: src/synfig/valuenode.cpp:192 src/synfig/valuenodes/valuenode_real.cpp:163
+#: src/synfig/valuenodes/valuenode_realstring.cpp:170
 msgid "Real"
 msgstr "浮點"
 
-#: src/synfig/valuenode.cpp:192 src/synfig/valuenode_realstring.cpp:120
+#: src/synfig/valuenode.cpp:193
+#: src/synfig/valuenodes/valuenode_realstring.cpp:120
 msgid "Real String"
 msgstr "浮點字串"
 
-#: src/synfig/valuenode.cpp:193 src/synfig/valuenode_join.cpp:137
+#: src/synfig/valuenode.cpp:194 src/synfig/valuenodes/valuenode_join.cpp:137
 msgid "Joined List"
 msgstr "Joined 清單"
 
-#: src/synfig/valuenode.cpp:194 src/synfig/valuenode_anglestring.cpp:122
+#: src/synfig/valuenode.cpp:195
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:122
 msgid "Angle String"
 msgstr "角度字串"
 
-#: src/synfig/valuenode.cpp:195 src/synfig/valuenode_intstring.cpp:117
+#: src/synfig/valuenode.cpp:196
+#: src/synfig/valuenodes/valuenode_intstring.cpp:117
 msgid "Int String"
 msgstr "整數字串"
 
-#: src/synfig/valuenode.cpp:196 src/synfig/valuenode_log.cpp:141
+#: src/synfig/valuenode.cpp:197 src/synfig/valuenodes/valuenode_log.cpp:141
 msgid "Logarithm"
 msgstr "對數"
 
-#: src/synfig/valuenode.cpp:197 src/synfig/valuenode_greyed.cpp:84
+#: src/synfig/valuenode.cpp:198 src/synfig/valuenodes/valuenode_greyed.cpp:84
 msgid "Greyed"
 msgstr "灰階"
 
-#: src/synfig/valuenode.cpp:198 src/synfig/valuenode_pow.cpp:162
-#: src/synfig/valuenode_pow.cpp:185
+#: src/synfig/valuenode.cpp:199 src/synfig/valuenodes/valuenode_pow.cpp:162
+#: src/synfig/valuenodes/valuenode_pow.cpp:185
 msgid "Power"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:199 src/synfig/valuenode_compare.cpp:149
+#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenodes/valuenode_compare.cpp:149
 msgid "Compare"
 msgstr "比較"
 
-#: src/synfig/valuenode.cpp:200
+#: src/synfig/valuenode.cpp:201
 msgid "Not"
 msgstr "不是"
 
-#: src/synfig/valuenode.cpp:201
+#: src/synfig/valuenode.cpp:202
 msgid "And"
 msgstr "和"
 
-#: src/synfig/valuenode.cpp:202
+#: src/synfig/valuenode.cpp:203
 msgid "Or"
 msgstr "或"
 
-#: src/synfig/valuenode.cpp:204 src/synfig/valuenode_boneinfluence.cpp:178
+#: src/synfig/valuenode.cpp:205
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:178
 msgid "Bone Influence"
 msgstr "骨架影響"
 
-#: src/synfig/valuenode.cpp:205 src/synfig/valuenode_bone.cpp:505
-#: src/synfig/valuenode_bonelink.cpp:208
-#: src/synfig/valuenode_boneweightpair.cpp:162
+#: src/synfig/valuenode.cpp:206 src/synfig/valuenodes/valuenode_bone.cpp:505
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:208
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:162
 msgid "Bone"
 msgstr "骨架"
 
-#: src/synfig/valuenode.cpp:206
+#: src/synfig/valuenode.cpp:207
 msgid "Root Bone"
 msgstr "跟骨架"
 
-#: src/synfig/valuenode.cpp:207 src/synfig/valuenode_staticlist.cpp:443
+#: src/synfig/valuenode.cpp:208
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:443
 msgid "Static List"
 msgstr "靜態清單"
 
-#: src/synfig/valuenode.cpp:208 src/synfig/valuenode_boneweightpair.cpp:119
+#: src/synfig/valuenode.cpp:209
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:119
 msgid "Bone Weight Pair"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:209 src/synfig/valuenode_bonelink.cpp:190
+#: src/synfig/valuenode.cpp:210
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:190
 msgid "Bone Link"
 msgstr "骨架連結"
 
-#: src/synfig/valuenode.cpp:211 src/synfig/valuenode_wplist.cpp:357
+#: src/synfig/valuenode.cpp:212 src/synfig/valuenodes/valuenode_wplist.cpp:357
 msgid "WPList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:212 src/synfig/valuenode_dilist.cpp:178
+#: src/synfig/valuenode.cpp:213 src/synfig/valuenodes/valuenode_dilist.cpp:178
 msgid "DIList"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:214 src/synfig/valuenode_average.cpp:97
+#: src/synfig/valuenode.cpp:215 src/synfig/valuenodes/valuenode_average.cpp:97
 msgid "Average"
 msgstr "平均"
 
-#: src/synfig/valuenode.cpp:215
+#: src/synfig/valuenode.cpp:216
 msgid "Weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:217 src/synfig/valuenode_dynamic.cpp:171
+#: src/synfig/valuenode.cpp:218
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:171
 msgid "Dynamic"
 msgstr "動態"
 
-#: src/synfig/valuenode.cpp:218 src/synfig/valuenode_derivative.cpp:315
+#: src/synfig/valuenode.cpp:219
+#: src/synfig/valuenodes/valuenode_derivative.cpp:315
 msgid "Derivative"
 msgstr "衍生"
 
-#: src/synfig/valuenode.cpp:253
+#: src/synfig/valuenode.cpp:256
 #, c-format
 msgid "Bad type: ValueNode '%s' doesn't accept type '%s'"
 msgstr ""
 
-#: src/synfig/valuenode.cpp:552
+#: src/synfig/valuenode.cpp:576
 msgid "Placeholder"
 msgstr "佔位符號"
 
@@ -3383,1319 +3493,1355 @@ msgstr "佔位符號"
 msgid "%s:%d wrong type for %s: need %s but got %s"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:113 src/synfig/valuenode_average.cpp:59
-#: src/synfig/valuenode_average.cpp:73
-#: src/synfig/valuenode_gradientrotate.cpp:78
-#: src/synfig/valuenode_integer.cpp:81 src/synfig/valuenode_integer.cpp:143
-#: src/synfig/valuenode_range.cpp:95 src/synfig/valuenode_real.cpp:78
-#: src/synfig/valuenode_real.cpp:138
-#: src/synfig/valuenode_repeat_gradient.cpp:84
-#: src/synfig/valuenode_scale.cpp:88 src/synfig/valuenode_stripes.cpp:81
-#: src/synfig/valuenode_subtract.cpp:113
-#: src/synfig/valuenode_weightedaverage.cpp:60
-#: src/synfig/valuenode_weightedaverage.cpp:70
+#: src/synfig/valuenodes/valuenode_add.cpp:113
+#: src/synfig/valuenodes/valuenode_average.cpp:59
+#: src/synfig/valuenodes/valuenode_average.cpp:73
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:78
+#: src/synfig/valuenodes/valuenode_integer.cpp:81
+#: src/synfig/valuenodes/valuenode_integer.cpp:143
+#: src/synfig/valuenodes/valuenode_range.cpp:95
+#: src/synfig/valuenodes/valuenode_real.cpp:81
+#: src/synfig/valuenodes/valuenode_real.cpp:143
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:84
+#: src/synfig/valuenodes/valuenode_scale.cpp:88
+#: src/synfig/valuenodes/valuenode_stripes.cpp:81
+#: src/synfig/valuenodes/valuenode_subtract.cpp:113
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:60
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:70
 msgid ":Bad type "
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:141 src/synfig/valuenode_scale.cpp:120
-#: src/synfig/valuenode_subtract.cpp:145
+#: src/synfig/valuenodes/valuenode_add.cpp:141
+#: src/synfig/valuenodes/valuenode_scale.cpp:120
+#: src/synfig/valuenodes/valuenode_subtract.cpp:145
 msgid "One or both of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:220 src/synfig/valuenode_compare.cpp:167
-#: src/synfig/valuenode_dotproduct.cpp:167
-#: src/synfig/valuenode_subtract.cpp:227
+#: src/synfig/valuenodes/valuenode_add.cpp:232
+#: src/synfig/valuenodes/valuenode_compare.cpp:167
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:167
+#: src/synfig/valuenodes/valuenode_subtract.cpp:227
 msgid "LHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:221
+#: src/synfig/valuenodes/valuenode_add.cpp:233
 msgid "Left Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:225 src/synfig/valuenode_compare.cpp:172
-#: src/synfig/valuenode_dotproduct.cpp:172
-#: src/synfig/valuenode_subtract.cpp:232
+#: src/synfig/valuenodes/valuenode_add.cpp:237
+#: src/synfig/valuenodes/valuenode_compare.cpp:172
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:172
+#: src/synfig/valuenodes/valuenode_subtract.cpp:232
 msgid "RHS"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:226
+#: src/synfig/valuenodes/valuenode_add.cpp:238
 msgid "Right Hand Side of the add"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:230 src/synfig/valuenode_scale.cpp:254
-#: src/synfig/valuenode_subtract.cpp:237
+#: src/synfig/valuenodes/valuenode_add.cpp:242
+#: src/synfig/valuenodes/valuenode_scale.cpp:254
+#: src/synfig/valuenodes/valuenode_subtract.cpp:237
 msgid "Scalar"
 msgstr ""
 
-#: src/synfig/valuenode_add.cpp:231
+#: src/synfig/valuenodes/valuenode_add.cpp:243
 msgid "Value that multiplies the add"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:129
+#: src/synfig/valuenodes/valuenode_and.cpp:129
 msgid "AND"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:147 src/synfig/valuenode_or.cpp:147
+#: src/synfig/valuenodes/valuenode_and.cpp:147
+#: src/synfig/valuenodes/valuenode_or.cpp:147
 msgid "Link1"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:148
+#: src/synfig/valuenodes/valuenode_and.cpp:148
 msgid "First operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:152 src/synfig/valuenode_or.cpp:152
+#: src/synfig/valuenodes/valuenode_and.cpp:152
+#: src/synfig/valuenodes/valuenode_or.cpp:152
 msgid "Link2"
 msgstr ""
 
-#: src/synfig/valuenode_and.cpp:153
+#: src/synfig/valuenodes/valuenode_and.cpp:153
 msgid "Second operand of the AND operation"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:170
-#: src/synfig/valuenode_intstring.cpp:166
-#: src/synfig/valuenode_realstring.cpp:171
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:170
+#: src/synfig/valuenodes/valuenode_intstring.cpp:166
+#: src/synfig/valuenodes/valuenode_realstring.cpp:171
 msgid "Value to convert to string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:175
-#: src/synfig/valuenode_intstring.cpp:171
-#: src/synfig/valuenode_realstring.cpp:176
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:175
+#: src/synfig/valuenodes/valuenode_intstring.cpp:171
+#: src/synfig/valuenodes/valuenode_realstring.cpp:176
 msgid "Width of the string"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:179
-#: src/synfig/valuenode_realstring.cpp:180
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:179
+#: src/synfig/valuenodes/valuenode_realstring.cpp:180
 msgid "Precision"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:180
-#: src/synfig/valuenode_realstring.cpp:181
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:180
+#: src/synfig/valuenodes/valuenode_realstring.cpp:181
 msgid "Number of decimal places"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:184
-#: src/synfig/valuenode_intstring.cpp:175
-#: src/synfig/valuenode_realstring.cpp:185
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:184
+#: src/synfig/valuenodes/valuenode_intstring.cpp:175
+#: src/synfig/valuenodes/valuenode_realstring.cpp:185
 msgid "Zero Padded"
 msgstr ""
 
-#: src/synfig/valuenode_anglestring.cpp:185
-#: src/synfig/valuenode_intstring.cpp:176
-#: src/synfig/valuenode_realstring.cpp:186
+#: src/synfig/valuenodes/valuenode_anglestring.cpp:185
+#: src/synfig/valuenodes/valuenode_intstring.cpp:176
+#: src/synfig/valuenodes/valuenode_realstring.cpp:186
 msgid "When checked, the string is left filled with zeros to match the width"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:357 src/synfig/valuenode_animated.cpp:381
-#: src/synfig/valuenode_animated.cpp:709 src/synfig/valuenode_animated.cpp:727
-#: src/synfig/valuenode_animated.cpp:811 src/synfig/valuenode_animated.cpp:830
+#: src/synfig/valuenodes/valuenode_animated.cpp:357
+#: src/synfig/valuenodes/valuenode_animated.cpp:381
+#: src/synfig/valuenodes/valuenode_animated.cpp:709
+#: src/synfig/valuenodes/valuenode_animated.cpp:727
+#: src/synfig/valuenodes/valuenode_animated.cpp:811
+#: src/synfig/valuenodes/valuenode_animated.cpp:830
 msgid "A waypoint already exists at this point in time"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1170
+#: src/synfig/valuenodes/valuenode_animated.cpp:1170
 #, c-format
 msgid "%s: You cannot use a %s in an animated ValueNode"
 msgstr ""
 
-#: src/synfig/valuenode_animated.cpp:1203
+#: src/synfig/valuenodes/valuenode_animated.cpp:1203
 msgid "Animated"
 msgstr "熱烈"
 
-#: src/synfig/valuenode_atan2.cpp:148
+#: src/synfig/valuenodes/valuenode_atan2.cpp:148
 msgid "X"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:149
+#: src/synfig/valuenodes/valuenode_atan2.cpp:149
 msgid "Cosine of the angle"
 msgstr "角度的餘弦"
 
-#: src/synfig/valuenode_atan2.cpp:153
+#: src/synfig/valuenodes/valuenode_atan2.cpp:153
 msgid "Y"
 msgstr ""
 
-#: src/synfig/valuenode_atan2.cpp:154
+#: src/synfig/valuenodes/valuenode_atan2.cpp:154
 msgid "Sine of the angle"
 msgstr "角度的正弦"
 
-#: src/synfig/valuenode_bline.cpp:986 src/synfig/valuenode_dilist.cpp:154
-#: src/synfig/valuenode_dynamiclist.cpp:675
-#: src/synfig/valuenode_staticlist.cpp:354 src/synfig/valuenode_wplist.cpp:333
+#: src/synfig/valuenodes/valuenode_bline.cpp:986
+#: src/synfig/valuenodes/valuenode_dilist.cpp:154
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:675
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:354
+#: src/synfig/valuenodes/valuenode_wplist.cpp:333
 msgid "No entries in list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:989 src/synfig/valuenode_dilist.cpp:157
-#: src/synfig/valuenode_dynamiclist.cpp:678
-#: src/synfig/valuenode_staticlist.cpp:357 src/synfig/valuenode_wplist.cpp:336
+#: src/synfig/valuenodes/valuenode_bline.cpp:989
+#: src/synfig/valuenodes/valuenode_dilist.cpp:157
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:678
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:357
+#: src/synfig/valuenodes/valuenode_wplist.cpp:336
 msgid "No entries in ret_list"
 msgstr ""
 
-#: src/synfig/valuenode_bline.cpp:998 src/synfig/valuenode_bline.cpp:1115
+#: src/synfig/valuenodes/valuenode_bline.cpp:998
+#: src/synfig/valuenodes/valuenode_bline.cpp:1115
 #, c-format
 msgid "Vertex %03d"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:244
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:244
 msgid "The Spline where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:249
-#: src/synfig/valuenode_blinecalcvertex.cpp:207
-#: src/synfig/valuenode_blinecalcwidth.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:249
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:212
 msgid "When checked, the amount would loop"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:254
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:254
 msgid "The position of the linked tangent on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:258
-#: src/synfig/valuenode_composite.cpp:763
-#: src/synfig/valuenode_composite.cpp:796
-#: src/synfig/valuenode_gradientrotate.cpp:169
-#: src/synfig/valuenode_linear.cpp:221
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:258
+#: src/synfig/valuenodes/valuenode_composite.cpp:763
+#: src/synfig/valuenodes/valuenode_composite.cpp:796
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:169
+#: src/synfig/valuenodes/valuenode_linear.cpp:221
 msgid "Offset"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:259
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:259
 msgid "Angle offset of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:264
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:264
 msgid "Scale of the tangent"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:268
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:268
 msgid "Fixed Length"
 msgstr "固定長度"
 
-#: src/synfig/valuenode_blinecalctangent.cpp:269
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:269
 msgid "When checked, the tangent's length is fixed"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalctangent.cpp:274
+#: src/synfig/valuenodes/valuenode_blinecalctangent.cpp:274
 msgid "When checked, the tangent is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:202
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:202
 msgid "The spline where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:212
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:212
 msgid "The position of the linked vertex on the Spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcvertex.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcvertex.cpp:217
 msgid "When checked, the position is Spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:207
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:207
 msgid "The spline where the width is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:217
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:217
 msgid "The position of the linked width on the spline (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:222
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:222
 msgid "Scale of the width"
 msgstr ""
 
-#: src/synfig/valuenode_blinecalcwidth.cpp:227
+#: src/synfig/valuenodes/valuenode_blinecalcwidth.cpp:227
 msgid "When checked, the width is spline length based"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:165
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:165
 msgid "The referenced tangent to reverse"
 msgstr ""
 
-#: src/synfig/valuenode_blinereversetangent.cpp:170
+#: src/synfig/valuenodes/valuenode_blinereversetangent.cpp:170
 msgid "When checked, the reference is reversed"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:249
+#: src/synfig/valuenodes/valuenode_bone.cpp:249
 #, c-format
 msgid "Bone %d"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:588
+#: src/synfig/valuenodes/valuenode_bone.cpp:588
 msgid "The name of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:592
+#: src/synfig/valuenodes/valuenode_bone.cpp:592
 msgid "Parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:593
+#: src/synfig/valuenodes/valuenode_bone.cpp:593
 msgid "The parent bone of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:598
+#: src/synfig/valuenodes/valuenode_bone.cpp:598
 msgid "The rotating origin of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:603
+#: src/synfig/valuenodes/valuenode_bone.cpp:603
 msgid "The rotating angle of the bone relative to its parent"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:607
+#: src/synfig/valuenodes/valuenode_bone.cpp:607
 msgid "Local Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:608
+#: src/synfig/valuenodes/valuenode_bone.cpp:608
 msgid "The scale of the bone aligned its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:612
+#: src/synfig/valuenodes/valuenode_bone.cpp:612
 msgid "Bone Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:613
+#: src/synfig/valuenodes/valuenode_bone.cpp:613
 msgid "Bone width at its origin"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:617
+#: src/synfig/valuenodes/valuenode_bone.cpp:617
 msgid "Recursive Length Scale"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:618
+#: src/synfig/valuenodes/valuenode_bone.cpp:618
 msgid "The scale of the bone and its children aligned to its length"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:622
+#: src/synfig/valuenodes/valuenode_bone.cpp:622
 msgid "Tip Width"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:623
+#: src/synfig/valuenodes/valuenode_bone.cpp:623
 msgid "Bone width at its tip"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:627
+#: src/synfig/valuenodes/valuenode_bone.cpp:627
 msgid "Z-Depth"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:628
+#: src/synfig/valuenodes/valuenode_bone.cpp:628
 msgid "The z-depth of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:632
+#: src/synfig/valuenodes/valuenode_bone.cpp:632
 msgid "Length Setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:633
+#: src/synfig/valuenodes/valuenode_bone.cpp:633
 msgid "The length of the bone at setup"
 msgstr ""
 
-#: src/synfig/valuenode_bone.cpp:1043
+#: src/synfig/valuenodes/valuenode_bone.cpp:1043
 msgid "Root"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:222
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:222
 msgid "Bone Weight List"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:223
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:223
 msgid "List of bones used to calculate the influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneinfluence.cpp:228
+#: src/synfig/valuenodes/valuenode_boneinfluence.cpp:228
 msgid "The value node being bone influenced"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:209
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:209
 msgid "The linked bone"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:213 src/synfig/valuenode_bonelink.cpp:214
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:213
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:214
 msgid "Base value"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:219
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:219
 msgid "Make translation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:224
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:224
 msgid "Make rotation"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:228
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:228
 msgid "Skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:229
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:229
 msgid "Make skew"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:233
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:233
 msgid "Scale X"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:234
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:234
 msgid "Make scaling by X-axis"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:238
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:238
 msgid "Scale Y"
 msgstr ""
 
-#: src/synfig/valuenode_bonelink.cpp:239
+#: src/synfig/valuenodes/valuenode_bonelink.cpp:239
 msgid "Make scaling by Y-axis"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:163
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:163
 msgid "Bone used to make influence"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:167
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:167
 msgid "weight"
 msgstr ""
 
-#: src/synfig/valuenode_boneweightpair.cpp:168
+#: src/synfig/valuenodes/valuenode_boneweightpair.cpp:168
 msgid "The relative value of influence of the bone"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:168
+#: src/synfig/valuenodes/valuenode_compare.cpp:168
 msgid "The left side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:173
+#: src/synfig/valuenodes/valuenode_compare.cpp:173
 msgid "The right side of the comparison"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:177
+#: src/synfig/valuenodes/valuenode_compare.cpp:177
 msgid "Greater"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:178
+#: src/synfig/valuenodes/valuenode_compare.cpp:178
 msgid "When checked, returns true if LHS > RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:182
+#: src/synfig/valuenodes/valuenode_compare.cpp:182
 msgid "Equal"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:183
+#: src/synfig/valuenodes/valuenode_compare.cpp:183
 msgid "When checked, returns true if LHS = RHS"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:187
+#: src/synfig/valuenodes/valuenode_compare.cpp:187
 msgid "Less"
 msgstr ""
 
-#: src/synfig/valuenode_compare.cpp:188
+#: src/synfig/valuenodes/valuenode_compare.cpp:188
 msgid "When checked, returns true if LHS < RHS"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:296
+#: src/synfig/valuenodes/valuenode_composite.cpp:296
 msgid "Bad type for composite"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:629
+#: src/synfig/valuenodes/valuenode_composite.cpp:629
 msgid "Red"
 msgstr "紅"
 
-#: src/synfig/valuenode_composite.cpp:630
+#: src/synfig/valuenodes/valuenode_composite.cpp:630
 msgid "The red component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:633
+#: src/synfig/valuenodes/valuenode_composite.cpp:633
 msgid "Green"
 msgstr "綠"
 
-#: src/synfig/valuenode_composite.cpp:634
+#: src/synfig/valuenodes/valuenode_composite.cpp:634
 msgid "The green component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:637
+#: src/synfig/valuenodes/valuenode_composite.cpp:637
 msgid "Blue"
 msgstr "藍"
 
-#: src/synfig/valuenode_composite.cpp:638
+#: src/synfig/valuenodes/valuenode_composite.cpp:638
 msgid "The blue component of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:641
+#: src/synfig/valuenodes/valuenode_composite.cpp:641
 msgid "Alpha"
 msgstr "透明度"
 
-#: src/synfig/valuenode_composite.cpp:642
+#: src/synfig/valuenodes/valuenode_composite.cpp:642
 msgid "The alpha of the color"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:650
+#: src/synfig/valuenodes/valuenode_composite.cpp:650
 msgid "Vertex 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:651
+#: src/synfig/valuenodes/valuenode_composite.cpp:651
 msgid "The first vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:654
-#: src/synfig/valuenode_composite.cpp:701
+#: src/synfig/valuenodes/valuenode_composite.cpp:654
+#: src/synfig/valuenodes/valuenode_composite.cpp:701
 msgid "Tangent 1"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:655
+#: src/synfig/valuenodes/valuenode_composite.cpp:655
 msgid "The first tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:658
+#: src/synfig/valuenodes/valuenode_composite.cpp:658
 msgid "Vertex 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:659
+#: src/synfig/valuenodes/valuenode_composite.cpp:659
 msgid "The second vertex of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:662
-#: src/synfig/valuenode_composite.cpp:705
+#: src/synfig/valuenodes/valuenode_composite.cpp:662
+#: src/synfig/valuenodes/valuenode_composite.cpp:705
 msgid "Tangent 2"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:663
+#: src/synfig/valuenodes/valuenode_composite.cpp:663
 msgid "The second tangent of the segment"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:671
+#: src/synfig/valuenodes/valuenode_composite.cpp:671
 msgid "X-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:672
+#: src/synfig/valuenodes/valuenode_composite.cpp:672
 msgid "The X-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:675
+#: src/synfig/valuenodes/valuenode_composite.cpp:675
 msgid "Y-Axis"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:676
+#: src/synfig/valuenodes/valuenode_composite.cpp:676
 msgid "The Y-Axis component of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:684
+#: src/synfig/valuenodes/valuenode_composite.cpp:684
 msgid "Vertex"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:685
+#: src/synfig/valuenodes/valuenode_composite.cpp:685
 msgid "The vertex of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:689
+#: src/synfig/valuenodes/valuenode_composite.cpp:689
 msgid "The width of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:693
+#: src/synfig/valuenodes/valuenode_composite.cpp:693
 msgid "Defines the Off and On position relative to neighbours"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:696
+#: src/synfig/valuenodes/valuenode_composite.cpp:696
 msgid "Split"
 msgstr "分離"
 
-#: src/synfig/valuenode_composite.cpp:697
+#: src/synfig/valuenodes/valuenode_composite.cpp:697
 msgid "When checked, tangents are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:702
+#: src/synfig/valuenodes/valuenode_composite.cpp:702
 msgid "The first tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:706
+#: src/synfig/valuenodes/valuenode_composite.cpp:706
 msgid "The second tangent of the Spline Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:709
+#: src/synfig/valuenodes/valuenode_composite.cpp:709
 msgid "Radius Split"
 msgstr "半徑分離"
 
-#: src/synfig/valuenode_composite.cpp:710
+#: src/synfig/valuenodes/valuenode_composite.cpp:710
 msgid "When checked, tangent's radii are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:713
+#: src/synfig/valuenodes/valuenode_composite.cpp:713
 msgid "Angle Split"
 msgstr "角度分離"
 
-#: src/synfig/valuenode_composite.cpp:714
+#: src/synfig/valuenodes/valuenode_composite.cpp:714
 msgid "When checked, tangent's angles are independent"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:723
+#: src/synfig/valuenodes/valuenode_composite.cpp:723
 msgid "The [0,1] position of the Width Point over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:727
+#: src/synfig/valuenodes/valuenode_composite.cpp:727
 msgid "The width of the Width Point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:730
-#: src/synfig/valuenode_composite.cpp:773
+#: src/synfig/valuenodes/valuenode_composite.cpp:730
+#: src/synfig/valuenodes/valuenode_composite.cpp:773
 msgid "Side Type Before"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:731
-#: src/synfig/valuenode_composite.cpp:741
+#: src/synfig/valuenodes/valuenode_composite.cpp:731
+#: src/synfig/valuenodes/valuenode_composite.cpp:741
 msgid "Defines the interpolation type of the width point"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:733
-#: src/synfig/valuenode_composite.cpp:743
+#: src/synfig/valuenodes/valuenode_composite.cpp:733
+#: src/synfig/valuenodes/valuenode_composite.cpp:743
 msgid "Interpolate"
 msgstr "內插模式"
 
-#: src/synfig/valuenode_composite.cpp:740
-#: src/synfig/valuenode_composite.cpp:782
+#: src/synfig/valuenodes/valuenode_composite.cpp:740
+#: src/synfig/valuenodes/valuenode_composite.cpp:782
 msgid "Side Type After"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:750
+#: src/synfig/valuenodes/valuenode_composite.cpp:750
 msgid "Lower Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:751
+#: src/synfig/valuenodes/valuenode_composite.cpp:751
 msgid "Defines the position at start of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:754
+#: src/synfig/valuenodes/valuenode_composite.cpp:754
 msgid "Upper Boundary"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:755
+#: src/synfig/valuenodes/valuenode_composite.cpp:755
 msgid "Defines the position at end of the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:764
+#: src/synfig/valuenodes/valuenode_composite.cpp:764
 msgid "The offset length of the Dash Item over the Spline"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:768
-#: src/synfig/valuenode_timedswap.cpp:272
+#: src/synfig/valuenodes/valuenode_composite.cpp:768
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:272
 msgid "Length"
 msgstr "長度"
 
-#: src/synfig/valuenode_composite.cpp:769
+#: src/synfig/valuenodes/valuenode_composite.cpp:769
 msgid "The length of the Dash Item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:774
-#: src/synfig/valuenode_composite.cpp:783
+#: src/synfig/valuenodes/valuenode_composite.cpp:774
+#: src/synfig/valuenodes/valuenode_composite.cpp:783
 msgid "Defines the side type of the dash item"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:797
+#: src/synfig/valuenodes/valuenode_composite.cpp:797
 msgid "The Offset component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:801
+#: src/synfig/valuenodes/valuenode_composite.cpp:801
 msgid "The Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:804
+#: src/synfig/valuenodes/valuenode_composite.cpp:804
 msgid "Skew Angle"
 msgstr "歪斜角度"
 
-#: src/synfig/valuenode_composite.cpp:805
+#: src/synfig/valuenodes/valuenode_composite.cpp:805
 msgid "The Skew Angle component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:809
+#: src/synfig/valuenodes/valuenode_composite.cpp:809
 msgid "The Scale component of the transformation"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:818
+#: src/synfig/valuenodes/valuenode_composite.cpp:818
 msgid "The Weight of the value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:821
+#: src/synfig/valuenodes/valuenode_composite.cpp:821
 msgid "Value"
 msgstr "值"
 
-#: src/synfig/valuenode_composite.cpp:822
+#: src/synfig/valuenodes/valuenode_composite.cpp:822
 msgid "The Value"
 msgstr ""
 
-#: src/synfig/valuenode_composite.cpp:830
+#: src/synfig/valuenodes/valuenode_composite.cpp:830
 msgid "First"
 msgstr "第一"
 
-#: src/synfig/valuenode_composite.cpp:831
+#: src/synfig/valuenodes/valuenode_composite.cpp:831
 msgid "The First Value"
 msgstr "第一個值"
 
-#: src/synfig/valuenode_composite.cpp:834
+#: src/synfig/valuenodes/valuenode_composite.cpp:834
 msgid "Second"
 msgstr "第二"
 
-#: src/synfig/valuenode_composite.cpp:835
+#: src/synfig/valuenodes/valuenode_composite.cpp:835
 msgid "The Second Value"
 msgstr "第二個值"
 
-#: src/synfig/valuenode_cos.cpp:156
+#: src/synfig/valuenodes/valuenode_cos.cpp:156
 msgid "Value to calculate the cosine"
 msgstr "計算餘弦的值"
 
-#: src/synfig/valuenode_cos.cpp:160 src/synfig/valuenode_sine.cpp:159
+#: src/synfig/valuenodes/valuenode_cos.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:159
 msgid "Amplitude"
 msgstr ""
 
-#: src/synfig/valuenode_cos.cpp:161
+#: src/synfig/valuenodes/valuenode_cos.cpp:161
 msgid "Multiplier of the resulting cosine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:368
+#: src/synfig/valuenodes/valuenode_derivative.cpp:368
 msgid "Value to calculate the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:371
+#: src/synfig/valuenodes/valuenode_derivative.cpp:371
 msgid "Interval"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:372
+#: src/synfig/valuenodes/valuenode_derivative.cpp:372
 msgid "Interval of time to calculate the finite differences"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:375
+#: src/synfig/valuenodes/valuenode_derivative.cpp:375
 msgid "Accuracy"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:376
+#: src/synfig/valuenodes/valuenode_derivative.cpp:376
 msgid "Accuracy of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:378
+#: src/synfig/valuenodes/valuenode_derivative.cpp:378
 msgid "Rough"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:380
+#: src/synfig/valuenodes/valuenode_derivative.cpp:380
 msgid "Fine"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:381
+#: src/synfig/valuenodes/valuenode_derivative.cpp:381
 msgid "Extreme"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:384
+#: src/synfig/valuenodes/valuenode_derivative.cpp:384
 msgid "Order"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:385
+#: src/synfig/valuenodes/valuenode_derivative.cpp:385
 msgid "Order of the derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:387
+#: src/synfig/valuenodes/valuenode_derivative.cpp:387
 msgid "First Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_derivative.cpp:388
+#: src/synfig/valuenodes/valuenode_derivative.cpp:388
 msgid "Second Derivative"
 msgstr ""
 
-#: src/synfig/valuenode_dilist.cpp:166
+#: src/synfig/valuenodes/valuenode_dilist.cpp:166
 #, c-format
 msgid "DashItem %03d"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:168
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:168
 msgid "The left side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_dotproduct.cpp:173
+#: src/synfig/valuenodes/valuenode_dotproduct.cpp:173
 msgid "The right side of the dot product"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:194
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:194
 msgid "From"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:195
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:195
 msgid "Initial value of the index "
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:199
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:199
 msgid "To"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:200
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:200
 msgid "Final value of the index"
 msgstr ""
 
-#: src/synfig/valuenode_duplicate.cpp:205
+#: src/synfig/valuenodes/valuenode_duplicate.cpp:205
 msgid "Amount increment of the index"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:237
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:237
 msgid "Tip static"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:238
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:238
 msgid "Equilibrium tip position without external forces"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:242
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:242
 msgid "Basement of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:245
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:245
 msgid "Force"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:246
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:246
 msgid "External force applied on the mass center of gravity"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:249
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:249
 msgid "Torque"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:250
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:250
 msgid "External momentum applied at the center of inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:253
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:253
 msgid "Damping coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:254
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:254
 msgid "Radial damping coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:257
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:257
 msgid "Friction coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:258
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:258
 msgid "Rotational friction coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:261
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:261
 msgid "Spring coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:262
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:262
 msgid "Radial spring coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:265
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:265
 msgid "Torsion coefficient"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:266
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:266
 msgid "Torsion coefficient of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:269
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:269
 msgid "Mass"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:270
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:270
 msgid "Mass of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:273
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:273
 msgid "Moment of Inertia"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:274
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:274
 msgid "Moment of inertia of the dynamic system"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:277
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:277
 msgid "Spring rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:278
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:278
 msgid "When checked, linear spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:281
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:281
 msgid "Torsion rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:282
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:282
 msgid "When checked torsion spring is rigid"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:285
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:285
 msgid "Origin drags tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamic.cpp:286
+#: src/synfig/valuenodes/valuenode_dynamic.cpp:286
 msgid "When checked result is origin + tip otherwise result is just tip"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:669
-#: src/synfig/valuenode_staticlist.cpp:351
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:669
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:351
 msgid "List type/item type mismatch, throwing away mismatch"
 msgstr ""
 
-#: src/synfig/valuenode_dynamiclist.cpp:717
-#: src/synfig/valuenode_dynamiclist.cpp:972
-#: src/synfig/valuenode_staticlist.cpp:396
-#: src/synfig/valuenode_staticlist.cpp:459
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:717
+#: src/synfig/valuenodes/valuenode_dynamiclist.cpp:972
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:396
+#: src/synfig/valuenodes/valuenode_staticlist.cpp:459
 #, c-format
 msgid "Item %03d"
 msgstr "項目 %03d"
 
-#: src/synfig/valuenode_exp.cpp:150
+#: src/synfig/valuenodes/valuenode_exp.cpp:150
 msgid "Exponent"
 msgstr "指數"
 
-#: src/synfig/valuenode_exp.cpp:151
+#: src/synfig/valuenodes/valuenode_exp.cpp:151
 msgid "The value to raise the constant 'e'"
 msgstr ""
 
-#: src/synfig/valuenode_exp.cpp:156
+#: src/synfig/valuenodes/valuenode_exp.cpp:156
 msgid "Multiplier of the resulting exponent"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:159
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:159
 msgid "The gradient where the color is picked from"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:164
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:164
 msgid "The position of the color at the gradient (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_gradientcolor.cpp:169
+#: src/synfig/valuenodes/valuenode_gradientcolor.cpp:169
 msgid "When checked, the index would loop"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:165
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:165
 msgid "The source gradient to rotate"
 msgstr ""
 
-#: src/synfig/valuenode_gradientrotate.cpp:170
+#: src/synfig/valuenodes/valuenode_gradientrotate.cpp:170
 msgid "The amount to offset the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_greyed.cpp:97
+#: src/synfig/valuenodes/valuenode_greyed.cpp:97
 msgid "The greyed value"
 msgstr "灰階值"
 
-#: src/synfig/valuenode_integer.cpp:192
+#: src/synfig/valuenodes/valuenode_integer.cpp:192
 msgid "The integer value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_intstring.cpp:165
+#: src/synfig/valuenodes/valuenode_intstring.cpp:165
 msgid "Int"
 msgstr "整數"
 
-#: src/synfig/valuenode_join.cpp:187
+#: src/synfig/valuenodes/valuenode_join.cpp:187
 msgid "Strings"
 msgstr "字串"
 
-#: src/synfig/valuenode_join.cpp:188
+#: src/synfig/valuenodes/valuenode_join.cpp:188
 msgid "The List of strings to join"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:192 src/synfig/valuenode_timedswap.cpp:257
+#: src/synfig/valuenodes/valuenode_join.cpp:192
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:257
 msgid "Before"
 msgstr "之前"
 
-#: src/synfig/valuenode_join.cpp:193
+#: src/synfig/valuenodes/valuenode_join.cpp:193
 msgid "The string to place before the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:197
+#: src/synfig/valuenodes/valuenode_join.cpp:197
 msgid "Separator"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:198
+#: src/synfig/valuenodes/valuenode_join.cpp:198
 msgid "The string to place between each string joined"
 msgstr ""
 
-#: src/synfig/valuenode_join.cpp:202 src/synfig/valuenode_timedswap.cpp:262
+#: src/synfig/valuenodes/valuenode_join.cpp:202
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:262
 msgid "After"
 msgstr "之後"
 
-#: src/synfig/valuenode_join.cpp:203
+#: src/synfig/valuenodes/valuenode_join.cpp:203
 msgid "The string to place after the joined strings"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:208
+#: src/synfig/valuenodes/valuenode_linear.cpp:208
 msgid "Rate"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:209 src/synfig/valuenode_linear.cpp:216
+#: src/synfig/valuenodes/valuenode_linear.cpp:209
+#: src/synfig/valuenodes/valuenode_linear.cpp:216
 msgid "Value that is multiplied by the current time (in seconds)"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:215
+#: src/synfig/valuenodes/valuenode_linear.cpp:215
 msgid "Slope"
 msgstr ""
 
-#: src/synfig/valuenode_linear.cpp:222
+#: src/synfig/valuenodes/valuenode_linear.cpp:222
 msgid "Returned value when the current time is zero"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:160
+#: src/synfig/valuenodes/valuenode_log.cpp:160
 msgid "Value node used to calculate the Neperian logarithm"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:164 src/synfig/valuenode_pow.cpp:190
-#: src/synfig/valuenode_reciprocal.cpp:170
+#: src/synfig/valuenodes/valuenode_log.cpp:164
+#: src/synfig/valuenodes/valuenode_pow.cpp:190
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:170
 msgid "Epsilon"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:165
+#: src/synfig/valuenodes/valuenode_log.cpp:165
 msgid "Value used to compare 'link' with zero "
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:169 src/synfig/valuenode_pow.cpp:195
-#: src/synfig/valuenode_reciprocal.cpp:175
+#: src/synfig/valuenodes/valuenode_log.cpp:169
+#: src/synfig/valuenodes/valuenode_pow.cpp:195
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:175
 msgid "Infinite"
 msgstr ""
 
-#: src/synfig/valuenode_log.cpp:170 src/synfig/valuenode_pow.cpp:196
+#: src/synfig/valuenodes/valuenode_log.cpp:170
+#: src/synfig/valuenodes/valuenode_pow.cpp:196
 msgid "Returned value when result tends to infinite"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:123
+#: src/synfig/valuenodes/valuenode_not.cpp:123
 msgid "NOT"
 msgstr ""
 
-#: src/synfig/valuenode_not.cpp:142
+#: src/synfig/valuenodes/valuenode_not.cpp:142
 msgid "Value node used to do the NOT operation"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:129
+#: src/synfig/valuenodes/valuenode_or.cpp:129
 msgid "OR"
 msgstr ""
 
-#: src/synfig/valuenode_or.cpp:148 src/synfig/valuenode_or.cpp:153
+#: src/synfig/valuenodes/valuenode_or.cpp:148
+#: src/synfig/valuenodes/valuenode_or.cpp:153
 msgid "Value node used for the OR boolean operation"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:180
+#: src/synfig/valuenodes/valuenode_pow.cpp:180
 msgid "Base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:181
+#: src/synfig/valuenodes/valuenode_pow.cpp:181
 msgid "The base to be raised to the power"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:186
+#: src/synfig/valuenodes/valuenode_pow.cpp:186
 msgid "The power used to raise the base"
 msgstr ""
 
-#: src/synfig/valuenode_pow.cpp:191
+#: src/synfig/valuenodes/valuenode_pow.cpp:191
 msgid "Value used to compare base or power with zero "
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:128
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:128
 msgid "Bad type for radialcomposite"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:255
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:255
 msgid "Luma"
 msgstr "亮度"
 
-#: src/synfig/valuenode_radialcomposite.cpp:273
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:273
 msgid "The length of the vector"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:276
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:276
 msgid "Theta"
 msgstr ""
 
-#: src/synfig/valuenode_radialcomposite.cpp:277
+#: src/synfig/valuenodes/valuenode_radialcomposite.cpp:277
 msgid "The angle of the vector with the X axis"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:128
+#: src/synfig/valuenodes/valuenode_range.cpp:128
 msgid "Some of my parameters aren't set!"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:279
+#: src/synfig/valuenodes/valuenode_range.cpp:279
 msgid "Min"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:280
+#: src/synfig/valuenodes/valuenode_range.cpp:280
 msgid "Returned value when 'Link' is smaller"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:284
+#: src/synfig/valuenodes/valuenode_range.cpp:284
 msgid "Max"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:285
+#: src/synfig/valuenodes/valuenode_range.cpp:285
 msgid "Returned value when 'Link' is greater"
 msgstr ""
 
-#: src/synfig/valuenode_range.cpp:290
+#: src/synfig/valuenodes/valuenode_range.cpp:290
 msgid "The value node to limit its range"
 msgstr ""
 
-#: src/synfig/valuenode_real.cpp:180
+#: src/synfig/valuenodes/valuenode_real.cpp:186
 msgid "The real value to be converted"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:166
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:166
 msgid "The value node used to calculate its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:171
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:171
 msgid ""
 "The value used to decide whether 'Link' is too small to obtain its reciprocal"
 msgstr ""
 
-#: src/synfig/valuenode_reciprocal.cpp:176
+#: src/synfig/valuenodes/valuenode_reciprocal.cpp:176
 msgid "The resulting value when 'Link' < 'Epsilon'"
 msgstr ""
 
-#: src/synfig/valuenode_reference.cpp:144
+#: src/synfig/valuenodes/valuenode_reference.cpp:144
 msgid "The referenced value"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:204
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:204
 msgid "The source gradient to repeat"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:208
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:208
 msgid "Count"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:209
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:209
 msgid "The number of repetition of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:214
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:214
 msgid ""
 "Specifies how much biased is the source gradient in the repetition [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:218
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:218
 msgid "Specify Start"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:219
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:219
 msgid ""
 "When checked, 'Start Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:223
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:223
 msgid "Specify End"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:224
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:224
 msgid ""
 "When checked, 'End Color' is used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:228
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:228
 msgid "Start Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:229
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:229
 msgid "Used as the start of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:233
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:233
 msgid "End Color"
 msgstr ""
 
-#: src/synfig/valuenode_repeat_gradient.cpp:234
+#: src/synfig/valuenodes/valuenode_repeat_gradient.cpp:234
 msgid "Used as the end of the resulting gradient"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:150 src/synfig/valuenode_scale.cpp:167
-#: src/synfig/valuenode_scale.cpp:178
+#: src/synfig/valuenodes/valuenode_reverse.cpp:308
+msgid "The value to be reversed"
+msgstr ""
+
+#: src/synfig/valuenodes/valuenode_scale.cpp:150
+#: src/synfig/valuenodes/valuenode_scale.cpp:167
+#: src/synfig/valuenodes/valuenode_scale.cpp:178
 msgid "Attempting to get the inverse of a non invertible Valuenode"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:250
+#: src/synfig/valuenodes/valuenode_scale.cpp:250
 msgid "The value node used to scale"
 msgstr ""
 
-#: src/synfig/valuenode_scale.cpp:255
+#: src/synfig/valuenodes/valuenode_scale.cpp:255
 msgid "Value that multiplies the value node"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:156
-#: src/synfig/valuenode_segcalcvertex.cpp:154
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:156
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:154
 msgid "Segment"
 msgstr "線段"
 
-#: src/synfig/valuenode_segcalctangent.cpp:157
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:157
 msgid "The Segment where the tangent is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalctangent.cpp:162
+#: src/synfig/valuenodes/valuenode_segcalctangent.cpp:162
 msgid "The position of the linked tangent on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:155
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:155
 msgid "The Segment where the vertex is linked to"
 msgstr ""
 
-#: src/synfig/valuenode_segcalcvertex.cpp:160
+#: src/synfig/valuenodes/valuenode_segcalcvertex.cpp:160
 msgid "The position of the linked vertex on the Segment (0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:155
+#: src/synfig/valuenodes/valuenode_sine.cpp:155
 msgid "The angle where the sine is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_sine.cpp:160
+#: src/synfig/valuenodes/valuenode_sine.cpp:160
 msgid "The value that multiplies the resulting sine"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:193
+#: src/synfig/valuenodes/valuenode_step.cpp:193
 msgid "The value node used to make the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:198
+#: src/synfig/valuenodes/valuenode_step.cpp:198
 msgid "The duration of the step"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:202 src/tool/printing_functions.cpp:71
+#: src/synfig/valuenodes/valuenode_step.cpp:202
+#: src/tool/printing_functions.cpp:71
 msgid "Start Time"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:203
+#: src/synfig/valuenodes/valuenode_step.cpp:203
 msgid "The time when the step conversion starts"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:207
+#: src/synfig/valuenodes/valuenode_step.cpp:207
 msgid "Intersection"
 msgstr ""
 
-#: src/synfig/valuenode_step.cpp:208
+#: src/synfig/valuenodes/valuenode_step.cpp:208
 msgid "Value that define whether the step is centered on the value [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:189 src/synfig/valuenode_twotone.cpp:153
+#: src/synfig/valuenodes/valuenode_stripes.cpp:189
+#: src/synfig/valuenodes/valuenode_twotone.cpp:153
 msgid "Color 1"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:190
+#: src/synfig/valuenodes/valuenode_stripes.cpp:190
 msgid "One color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:194 src/synfig/valuenode_twotone.cpp:158
+#: src/synfig/valuenodes/valuenode_stripes.cpp:194
+#: src/synfig/valuenodes/valuenode_twotone.cpp:158
 msgid "Color 2"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:195
+#: src/synfig/valuenodes/valuenode_stripes.cpp:195
 msgid "Other color of the gradient stripes"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:199
+#: src/synfig/valuenodes/valuenode_stripes.cpp:199
 msgid "Stripe Count"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:200
+#: src/synfig/valuenodes/valuenode_stripes.cpp:200
 msgid "Number of stripes in the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_stripes.cpp:205
+#: src/synfig/valuenodes/valuenode_stripes.cpp:205
 msgid "Width of stripes in the gradient between [0,1]"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:228
+#: src/synfig/valuenodes/valuenode_subtract.cpp:228
 msgid "Left Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:233
+#: src/synfig/valuenodes/valuenode_subtract.cpp:233
 msgid "Right Hand Side of the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_subtract.cpp:238
+#: src/synfig/valuenodes/valuenode_subtract.cpp:238
 msgid "Value that multiplies the subtraction"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:153
+#: src/synfig/valuenodes/valuenode_switch.cpp:153
 msgid "Link Off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:154
+#: src/synfig/valuenodes/valuenode_switch.cpp:154
 msgid "The value node returned when the switch is off"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:158
+#: src/synfig/valuenodes/valuenode_switch.cpp:158
 msgid "Link On"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:159
+#: src/synfig/valuenodes/valuenode_switch.cpp:159
 msgid "The value node returned when the switch is on"
 msgstr ""
 
-#: src/synfig/valuenode_switch.cpp:164
+#: src/synfig/valuenodes/valuenode_switch.cpp:164
 msgid "When checked, returns 'Link On', otherwise returns 'Link Off'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:258
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:258
 msgid "The value node returned when current time is before 'time' - 'length'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:263
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:263
 msgid "The value node returned when current time is after 'time'"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:267
-#: src/synfig/valuenode_timestring.cpp:156
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:267
+#: src/synfig/valuenodes/valuenode_timestring.cpp:156
 msgid "Time"
 msgstr "時間"
 
-#: src/synfig/valuenode_timedswap.cpp:268
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:268
 msgid "The time when the linear interpolation ends"
 msgstr ""
 
-#: src/synfig/valuenode_timedswap.cpp:273
+#: src/synfig/valuenodes/valuenode_timedswap.cpp:273
 msgid ""
 "The length of time when the linear interpolation between 'Before' and "
 "'After' is made"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:175
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:175
 msgid "The value node to time loop"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:180
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:180
 msgid "Start time of the loop for the value node Timeline"
 msgstr ""
 
-#: src/synfig/valuenode_timeloop.cpp:190
+#: src/synfig/valuenodes/valuenode_timeloop.cpp:190
 msgid "Length of the loop"
 msgstr ""
 
-#: src/synfig/valuenode_timestring.cpp:157
+#: src/synfig/valuenodes/valuenode_timestring.cpp:157
 msgid "The time that is converted to string"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:154
+#: src/synfig/valuenodes/valuenode_twotone.cpp:154
 msgid "The start color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_twotone.cpp:159
+#: src/synfig/valuenodes/valuenode_twotone.cpp:159
 msgid "The end color of the gradient"
 msgstr ""
 
-#: src/synfig/valuenode_vectorangle.cpp:143
-#: src/synfig/valuenode_vectorlength.cpp:141
-#: src/synfig/valuenode_vectorx.cpp:141 src/synfig/valuenode_vectory.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:143
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:141
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:141
+#: src/synfig/valuenodes/valuenode_vectory.cpp:141
 msgid "Vector"
 msgstr "向量"
 
-#: src/synfig/valuenode_vectorangle.cpp:144
+#: src/synfig/valuenodes/valuenode_vectorangle.cpp:144
 msgid "The vector where the angle is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorlength.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorlength.cpp:142
 msgid "The vector where the length is calculated from"
 msgstr ""
 
-#: src/synfig/valuenode_vectorx.cpp:142
+#: src/synfig/valuenodes/valuenode_vectorx.cpp:142
 msgid "The vector where the X coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_vectory.cpp:142
+#: src/synfig/valuenodes/valuenode_vectory.cpp:142
 msgid "The vector where the Y coordinate is extracted from"
 msgstr ""
 
-#: src/synfig/valuenode_weightedaverage.cpp:105
+#: src/synfig/valuenodes/valuenode_weightedaverage.cpp:105
 msgid "weighted Average"
 msgstr ""
 
-#: src/synfig/valuenode_wplist.cpp:345
+#: src/synfig/valuenodes/valuenode_wplist.cpp:345
 #, c-format
 msgid "WidthPoint %03d"
 msgstr ""
diff --git a/src/Makefile.in b/src/Makefile.in
index 22f0f5f..88152c9 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -16,7 +16,17 @@
 
 # $Id$
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -80,7 +90,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -99,6 +108,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 =
@@ -158,6 +168,7 @@ am__define_uniq_tagged_files = \
 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`; \
@@ -417,7 +428,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -713,6 +723,8 @@ uninstall-am:
 	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.
diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in
index 2e923ea..cdb4999 100644
--- a/src/modules/Makefile.in
+++ b/src/modules/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
 # $Id$
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -81,8 +91,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/modules
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(srcdir)/synfig_modules.cfg.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -101,6 +109,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 = synfig_modules.cfg
@@ -189,6 +198,8 @@ am__define_uniq_tagged_files = \
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(srcdir)/synfig_modules.cfg.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -493,7 +504,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/modules/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -816,6 +826,8 @@ uninstall-am: uninstall-sysconfDATA
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
 	uninstall-am uninstall-sysconfDATA
 
+.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.
diff --git a/src/modules/lyr_freetype/Makefile.in b/src/modules/lyr_freetype/Makefile.in
index d00f4de..db5c2ac 100644
--- a/src/modules/lyr_freetype/Makefile.in
+++ b/src/modules/lyr_freetype/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
 # $Id$
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -83,8 +93,6 @@ host_triplet = @host@
 @WITH_FONTCONFIG_TRUE@@WITH_FREETYPE_TRUE at am__append_1 = @FONTCONFIG_LIBS@
 @WITH_FONTCONFIG_TRUE@@WITH_FREETYPE_TRUE at am__append_2 = @FONTCONFIG_CFLAGS@
 subdir = src/modules/lyr_freetype
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -103,6 +111,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 =
@@ -233,6 +242,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -486,7 +496,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/lyr_freetype/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/modules/lyr_freetype/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -553,22 +562,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblyr_freetype_la-main.Plo at am__quote@
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
@@ -801,6 +813,8 @@ uninstall-am: uninstall-moduleLTLIBRARIES
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-moduleLTLIBRARIES
 
+.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.
diff --git a/src/modules/lyr_freetype/lyr_freetype.cpp b/src/modules/lyr_freetype/lyr_freetype.cpp
index 7017c08..7c9e1a4 100644
--- a/src/modules/lyr_freetype/lyr_freetype.cpp
+++ b/src/modules/lyr_freetype/lyr_freetype.cpp
@@ -408,7 +408,7 @@ Layer_Freetype::new_face(const String &newfont)
 				FcFontSetAdd(fs, match);
 			if (pat)
 				FcPatternDestroy(pat);
-			if(fs){
+			if(fs && fs->nfont){
 				FcChar8* file;
 				if( FcPatternGetString (fs->fonts[0], FC_FILE, 0, &file) == FcResultMatch )
 					error=FT_New_Face(ft_library,(const char*)file,face_index,&face);
diff --git a/src/modules/lyr_freetype/lyr_freetype.h b/src/modules/lyr_freetype/lyr_freetype.h
index 79fdcef..807d03d 100644
--- a/src/modules/lyr_freetype/lyr_freetype.h
+++ b/src/modules/lyr_freetype/lyr_freetype.h
@@ -35,7 +35,7 @@
 //#define USE_MAC_FT_FUNCS	(1)
 //#endif
 
-#include <synfig/layer_composite.h>
+#include <synfig/layers/layer_composite.h>
 #include <synfig/vector.h>
 #include <synfig/color.h>
 #include <synfig/string.h>
diff --git a/src/modules/lyr_std/Makefile.in b/src/modules/lyr_std/Makefile.in
index 360b024..edef277 100644
--- a/src/modules/lyr_std/Makefile.in
+++ b/src/modules/lyr_std/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
 # $Id$
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -81,8 +91,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/modules/lyr_std
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -101,6 +109,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 =
@@ -233,6 +242,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -524,7 +534,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/lyr_std/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/modules/lyr_std/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -610,22 +619,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblyr_std_la-zoom.Plo at am__quote@
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
@@ -991,6 +1003,8 @@ uninstall-am: uninstall-moduleLTLIBRARIES
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-moduleLTLIBRARIES
 
+.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.
diff --git a/src/modules/lyr_std/bevel.h b/src/modules/lyr_std/bevel.h
index 565cc77..fd2a52e 100644
--- a/src/modules/lyr_std/bevel.h
+++ b/src/modules/lyr_std/bevel.h
@@ -29,7 +29,7 @@
 
 /* -- H E A D E R S --------------------------------------------------------- */
 
-#include <synfig/layer_composite.h>
+#include <synfig/layers/layer_composite.h>
 #include <synfig/color.h>
 #include <synfig/vector.h>
 #include <synfig/blur.h>
diff --git a/src/modules/lyr_std/booleancurve.h b/src/modules/lyr_std/booleancurve.h
index 90053d9..4d716b7 100644
--- a/src/modules/lyr_std/booleancurve.h
+++ b/src/modules/lyr_std/booleancurve.h
@@ -26,7 +26,7 @@
 #define __SYNFIG_BOOLEAN_CURVE_H
 
 /* === H E A D E R S ======================================================= */
-#include <synfig/layer_shape.h>
+#include <synfig/layers/layer_shape.h>
 #include <synfig/blinepoint.h>
 
 #include <vector>
diff --git a/src/modules/lyr_std/import.cpp b/src/modules/lyr_std/import.cpp
index 8f2e29b..15a9595 100644
--- a/src/modules/lyr_std/import.cpp
+++ b/src/modules/lyr_std/import.cpp
@@ -1,413 +1,413 @@
-/* === S Y N F I G ========================================================= */
-/*!	\file import.cpp
-**	\brief Implementation of the "Import Image" layer
-**
-**	$Id$
-**
-**	\legal
-**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**	Copyright (c) 2007 Chris Moore
-**	Copyright (c) 2011-2013 Carlos López
-**
-**	This package is free software; you can redistribute it and/or
-**	modify it under the terms of the GNU General Public License as
-**	published by the Free Software Foundation; either version 2 of
-**	the License, or (at your option) any later version.
-**
-**	This package is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-**	General Public License for more details.
-**	\endlegal
-**
-** === N O T E S ===========================================================
-**
-** ========================================================================= */
-
-/* === H E A D E R S ======================================================= */
-
-#ifdef USING_PCH
-#	include "pch.h"
-#else
-#ifdef HAVE_CONFIG_H
-#	include <config.h>
-#endif
-
-#include "import.h"
-#include <synfig/string.h>
-#include <synfig/time.h>
-#include <synfig/context.h>
-#include <synfig/paramdesc.h>
-#include <synfig/renddesc.h>
-#include <synfig/surface.h>
-#include <synfig/value.h>
-#include <synfig/valuenode.h>
-#include <synfig/canvas.h>
-#include <synfig/filesystemnative.h>
-
-#endif
-
-using namespace synfig;
-using namespace std;
-using namespace etl;
-
-/* === M A C R O S ========================================================= */
-
-/* === G L O B A L S ======================================================= */
-
-SYNFIG_LAYER_INIT(Import);
-SYNFIG_LAYER_SET_NAME(Import,"import");
-SYNFIG_LAYER_SET_LOCAL_NAME(Import,N_("Import Image"));
-SYNFIG_LAYER_SET_CATEGORY(Import,N_("Other"));
-SYNFIG_LAYER_SET_VERSION(Import,"0.1");
-SYNFIG_LAYER_SET_CVS_ID(Import,"$Id$");
-
-/* === P R O C E D U R E S ================================================= */
-
-/* === M E T H O D S ======================================================= */
-
-Import::Import():
-	param_filename(ValueBase(String())),
-	param_time_offset(ValueBase(Time(0)))
-{
-	SET_INTERPOLATION_DEFAULTS();
-	SET_STATIC_DEFAULTS();
-}
-
-Import::~Import()
-{
-}
-
-void
-Import::on_canvas_set()
-{
-	if(get_canvas())set_param("filename",param_filename);
-}
-
-bool
-Import::set_param(const String & param, const ValueBase &value)
-{
-	try{
-	IMPORT_VALUE(param_time_offset);
-
-	String filename=param_filename.get(String());
-	IMPORT_VALUE_PLUS_BEGIN(param_filename)
-	{
-		if(!get_canvas())
-		{
-			filename=value.get(filename);
-			importer=0;
-			cimporter=0;
-			surface.clear();
-			csurface.set_cairo_surface(NULL);
-			param_filename.set(filename);
-			return true;
-		}
-
-		String newfilename=value.get(string());
-		String filename_with_path;
-
-		// Get rid of any %20 crap
-		{
-			String::size_type n;
-			while((n=newfilename.find("%20"))!=String::npos)
-				newfilename.replace(n,3," ");
-		}
-
-		//if(get_canvas()->get_file_path()==dirname(newfilename))
-		//{
-		//	synfig::info("Image seems to be in local directory. Adjusting path...");
-		//	newfilename=basename(newfilename);
-		//}
-
-#ifndef WIN32
-		if(is_absolute_path(newfilename))
-		{
-			string curpath(cleanup_path(absolute_path(get_canvas()->get_file_path())));
-			while(basename(curpath)==".")curpath=dirname(curpath);
-
-			newfilename=relative_path(curpath,newfilename);
-			synfig::info("basename(curpath)=%s, Path adjusted to %s",basename(curpath).c_str(),newfilename.c_str());
-		}
-#endif
-
-		// TODO: "images" and "container:" literals
-		String newfilename_orig = newfilename;
-		if (newfilename_orig.substr(0, String("#").size()) == "#")
-			newfilename_orig = "#images/" + newfilename_orig.substr(String("#").size());
-
-		if(filename.empty())
-			filename=newfilename;
-
-		if(newfilename.empty())
-		{
-			filename=newfilename;
-			importer=0;
-			cimporter=0;
-			surface.clear();
-			csurface.set_cairo_surface(NULL);
-			param_filename.set(filename);
-			return true;
-		}
-
-		switch (get_method())
-		{
-		
-		case SOFTWARE:
-			{
-				// If we are already loaded, don't reload
-				if(filename==newfilename && importer)
-				{
-					synfig::warning(strprintf(_("Filename seems to already be set to \"%s\" (%s)"),filename.c_str(),newfilename.c_str()));
-					return true;
-				}
-
-				assert(get_canvas());
-
-				FileSystem::Handle file_system = get_canvas()->get_identifier().file_system;
-				if (!file_system) file_system = FileSystemNative::instance();
-
-				// todo: literal "container:"
-				if(is_absolute_path(newfilename_orig)
-				|| newfilename_orig.substr(0, std::string("#").size())=="#")
-					filename_with_path=newfilename_orig;
-				else
-					filename_with_path=absolute_path(get_canvas()->get_file_path()+ETL_DIRECTORY_SEPARATOR+newfilename_orig);
-
-				handle<Importer> newimporter;
-
-				newimporter=Importer::open(file_system->get_identifier(filename_with_path));
-
-				if(!newimporter)
-				{
-					newimporter=Importer::open(file_system->get_identifier(get_canvas()->get_file_path()+ETL_DIRECTORY_SEPARATOR+basename(newfilename_orig)));
-					if(!newimporter)
-					{
-						synfig::error(strprintf("Unable to create an importer object with file \"%s\"",filename_with_path.c_str()));
-						importer=0;
-						filename=newfilename;
-						abs_filename=filename_with_path;
-						surface.clear();
-						param_filename.set(filename);
-						return false;
-					}
-				}
-
-				surface.clear();
-				if(!newimporter->get_frame(surface,get_canvas()->rend_desc(),Time(0),trimmed,width,height,top,left))
-				{
-					synfig::warning(strprintf("Unable to get frame from \"%s\"",filename_with_path.c_str()));
-				}
-
-				importer=newimporter;
-				filename=newfilename;
-				abs_filename=filename_with_path;
-				param_filename.set(filename);
-
-				return true;
-			}
-		case OPENGL:
-			{
-				return false;
-			}
-		case CAIRO:
-			{
-				
-				if(filename==newfilename && cimporter)
-				{
-					synfig::warning(strprintf(_("Filename seems to already be set to \"%s\" (%s)"),filename.c_str(),newfilename.c_str()));
-					return true;
-				}
-				assert(get_canvas());
-				 
-				FileSystem::Handle file_system = get_canvas()->get_identifier().file_system;
-				if (!file_system) file_system = FileSystemNative::instance();
-
-				// todo: literal "container:"
-				if(is_absolute_path(newfilename_orig)
-				|| newfilename_orig.substr(0, std::string("#").size())=="#")
-					filename_with_path=newfilename_orig;
-				else
-					filename_with_path=absolute_path(get_canvas()->get_file_path()+ETL_DIRECTORY_SEPARATOR+newfilename_orig);
-				 
-				handle<CairoImporter> newimporter;
-				 
-				newimporter=CairoImporter::open(file_system->get_identifier(filename_with_path));
-				 
-				if(!newimporter)
-				{
-					newimporter=CairoImporter::open(file_system->get_identifier(get_canvas()->get_file_path()+ETL_DIRECTORY_SEPARATOR+basename(newfilename_orig)));
-					if(!newimporter)
-					{
-						synfig::error(strprintf("Unable to create an importer object with file \"%s\"",filename_with_path.c_str()));
-						cimporter=0;
-						filename=newfilename;
-						abs_filename=filename_with_path;
-						csurface.set_cairo_surface(NULL);
-						param_filename.set(filename);
-						return false;
-					}
-				}
-				 
-				cairo_surface_t* cs;
-				if(!newimporter->get_frame(cs, get_canvas()->rend_desc(), Time(0), trimmed, width, height, top, left))
-				{
-					synfig::warning(strprintf("Unable to get frame from \"%s\"",filename_with_path.c_str()));
-				}
-				set_cairo_surface(cs);
-				cairo_surface_destroy(cs);
-				 
-				cimporter=newimporter;
-				filename=newfilename;
-				abs_filename=filename_with_path;
-				param_filename.set(filename);
-
-				return true;
-				
-				//return false;
-			}
-		}
-	}
-	IMPORT_VALUE_PLUS_END
-	} catch(...) { set_amount(0); return false; }
-
-	return Layer_Bitmap::set_param(param,value);
-}
-
-ValueBase
-Import::get_param(const String & param)const
-{
-	EXPORT_VALUE(param_time_offset);
-
-	if(get_canvas())
-	{
-		if(param=="filename")
-		{
-			ValueBase ret(type_string);
-			// This line is needed to copy the internals of ValueBase from param_filename
-			ret=param_filename;
-			
-			// todo: literal "container:" and "images"
-			if(ret.get(String()).substr(0, std::string("#").size())!="#") {
-				string curpath(cleanup_path(absolute_path(get_canvas()->get_file_path())));
-				ret=relative_path(curpath,abs_filename);
-			} else
-			if(ret.get(String()).substr(0, std::string("#images/").size())=="#images/") {
-				ret = "#" + ret.get(String()).substr(std::string("#images/").size());
-			}
-
-			return ret;
-		}
-	}
-	else
-		EXPORT_VALUE(param_filename);
-
-	EXPORT_NAME();
-	EXPORT_VERSION();
-
-	return Layer_Bitmap::get_param(param);
-}
-
-Layer::Vocab
-Import::get_param_vocab()const
-{
-	Layer::Vocab ret(Layer_Bitmap::get_param_vocab());
-
-	ret.push_back(ParamDesc("filename")
-		.set_local_name(_("Filename"))
-		.set_description(_("File to import"))
-		.set_hint("filename")
-	);
-	ret.push_back(ParamDesc("time_offset")
-		.set_local_name(_("Time Offset"))
-		.set_description(_("Time Offset to apply to the imported file"))
-	);
-
-	return ret;
-}
-
-void
-Import::set_time(IndependentContext context, Time time)const
-{
-	Time time_offset=param_time_offset.get(Time());
-	switch (get_method())
-	{
-	case SOFTWARE:
-		if(get_amount() && importer &&
-		   importer->is_animated())
-			importer->get_frame(surface,get_canvas()->rend_desc(),time+time_offset,trimmed,width,height,top,left);
-		break;
-	case OPENGL:
-		break;
-	case CAIRO:
-		{
-
-			if(get_amount() && cimporter &&
-			   cimporter->is_animated())
-			{
-				cairo_surface_t* cs;
-				cimporter->get_frame(cs, get_canvas()->rend_desc(), time+time_offset, trimmed, width, height, top, left);
-				if(cs)
-				{
-					csurface.set_cairo_surface(cs);
-					csurface.map_cairo_image();
-					cairo_surface_destroy(cs);
-				}
-			}
-			break;
-
-		}
-	
-	}
-	context.set_time(time);
-}
-
-void
-Import::set_time(IndependentContext context, Time time, const Point &pos)const
-{
-	Time time_offset=param_time_offset.get(Time());
-	switch (get_method())
-	{
-		case SOFTWARE:
-			if(get_amount() && importer &&
-			   importer->is_animated())
-				importer->get_frame(surface,get_canvas()->rend_desc(),time+time_offset,trimmed,width,height,top,left);
-			break;
-		case OPENGL:
-			break;
-		case CAIRO:
-		{
-
-			if(get_amount() && cimporter &&
-			   cimporter->is_animated())
-			{
-				cairo_surface_t* cs;
-				cimporter->get_frame(cs, get_canvas()->rend_desc(), time+time_offset, trimmed, width, height, top, left);
-				if(cs)
-				{
-					csurface.set_cairo_surface(cs);
-					csurface.map_cairo_image();
-					cairo_surface_destroy(cs);
-				}
-			}
-			break;
-
-		}
-			
-	}
-	context.set_time(time,pos);
-}
-
-void
-Import::set_render_method(Context context, RenderMethod x)
-{
-	if(get_method() != x) // if the method is different
-	{
-		Layer_Bitmap::set_render_method(context, x); // set the method (and pass to the other layers)
-		importer=0; // invalidate the importer
-		cimporter=0;
-		set_param("filename", param_filename); // this will update the importer to the new type
-	}
-	else
-		context.set_render_method(x); // pass it down.
-}
+/* === S Y N F I G ========================================================= */
+/*!	\file import.cpp
+**	\brief Implementation of the "Import Image" layer
+**
+**	$Id$
+**
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
+**	Copyright (c) 2011-2013 Carlos López
+**
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
+**
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
+**	\endlegal
+**
+** === N O T E S ===========================================================
+**
+** ========================================================================= */
+
+/* === H E A D E R S ======================================================= */
+
+#ifdef USING_PCH
+#	include "pch.h"
+#else
+#ifdef HAVE_CONFIG_H
+#	include <config.h>
+#endif
+
+#include "import.h"
+#include <synfig/string.h>
+#include <synfig/time.h>
+#include <synfig/context.h>
+#include <synfig/paramdesc.h>
+#include <synfig/renddesc.h>
+#include <synfig/surface.h>
+#include <synfig/value.h>
+#include <synfig/valuenode.h>
+#include <synfig/canvas.h>
+#include <synfig/filesystemnative.h>
+
+#endif
+
+using namespace synfig;
+using namespace std;
+using namespace etl;
+
+/* === M A C R O S ========================================================= */
+
+/* === G L O B A L S ======================================================= */
+
+SYNFIG_LAYER_INIT(Import);
+SYNFIG_LAYER_SET_NAME(Import,"import");
+SYNFIG_LAYER_SET_LOCAL_NAME(Import,N_("Import Image"));
+SYNFIG_LAYER_SET_CATEGORY(Import,N_("Other"));
+SYNFIG_LAYER_SET_VERSION(Import,"0.1");
+SYNFIG_LAYER_SET_CVS_ID(Import,"$Id$");
+
+/* === P R O C E D U R E S ================================================= */
+
+/* === M E T H O D S ======================================================= */
+
+Import::Import():
+	param_filename(ValueBase(String())),
+	param_time_offset(ValueBase(Time(0)))
+{
+	SET_INTERPOLATION_DEFAULTS();
+	SET_STATIC_DEFAULTS();
+}
+
+Import::~Import()
+{
+}
+
+void
+Import::on_canvas_set()
+{
+	if(get_canvas())set_param("filename",param_filename);
+}
+
+bool
+Import::set_param(const String & param, const ValueBase &value)
+{
+	try{
+	IMPORT_VALUE(param_time_offset);
+
+	String filename=param_filename.get(String());
+	IMPORT_VALUE_PLUS_BEGIN(param_filename)
+	{
+		if(!get_canvas())
+		{
+			filename=value.get(filename);
+			importer=0;
+			cimporter=0;
+			surface.clear();
+			csurface.set_cairo_surface(NULL);
+			param_filename.set(filename);
+			return true;
+		}
+
+		String newfilename=value.get(string());
+		String filename_with_path;
+
+		// Get rid of any %20 crap
+		{
+			String::size_type n;
+			while((n=newfilename.find("%20"))!=String::npos)
+				newfilename.replace(n,3," ");
+		}
+
+		//if(get_canvas()->get_file_path()==dirname(newfilename))
+		//{
+		//	synfig::info("Image seems to be in local directory. Adjusting path...");
+		//	newfilename=basename(newfilename);
+		//}
+
+#ifndef WIN32
+		if(is_absolute_path(newfilename))
+		{
+			string curpath(cleanup_path(absolute_path(get_canvas()->get_file_path())));
+			while(basename(curpath)==".")curpath=dirname(curpath);
+
+			newfilename=relative_path(curpath,newfilename);
+			synfig::info("basename(curpath)=%s, Path adjusted to %s",basename(curpath).c_str(),newfilename.c_str());
+		}
+#endif
+
+		// TODO: "images" and "container:" literals
+		String newfilename_orig = newfilename;
+		if (newfilename_orig.substr(0, String("#").size()) == "#")
+			newfilename_orig = "#images/" + newfilename_orig.substr(String("#").size());
+
+		if(filename.empty())
+			filename=newfilename;
+
+		if(newfilename.empty())
+		{
+			filename=newfilename;
+			importer=0;
+			cimporter=0;
+			surface.clear();
+			csurface.set_cairo_surface(NULL);
+			param_filename.set(filename);
+			return true;
+		}
+
+		switch (get_method())
+		{
+		
+		case SOFTWARE:
+			{
+				// If we are already loaded, don't reload
+				if(filename==newfilename && importer)
+				{
+					synfig::warning(strprintf(_("Filename seems to already be set to \"%s\" (%s)"),filename.c_str(),newfilename.c_str()));
+					return true;
+				}
+
+				assert(get_canvas());
+
+				FileSystem::Handle file_system = get_canvas()->get_identifier().file_system;
+				if (!file_system) file_system = FileSystemNative::instance();
+
+				// todo: literal "container:"
+				if(is_absolute_path(newfilename_orig)
+				|| newfilename_orig.substr(0, std::string("#").size())=="#")
+					filename_with_path=newfilename_orig;
+				else
+					filename_with_path=absolute_path(get_canvas()->get_file_path()+ETL_DIRECTORY_SEPARATOR+newfilename_orig);
+
+				handle<Importer> newimporter;
+
+				newimporter=Importer::open(file_system->get_identifier(filename_with_path));
+
+				if(!newimporter)
+				{
+					newimporter=Importer::open(file_system->get_identifier(get_canvas()->get_file_path()+ETL_DIRECTORY_SEPARATOR+basename(newfilename_orig)));
+					if(!newimporter)
+					{
+						synfig::error(strprintf("Unable to create an importer object with file \"%s\"",filename_with_path.c_str()));
+						importer=0;
+						filename=newfilename;
+						abs_filename=filename_with_path;
+						surface.clear();
+						param_filename.set(filename);
+						return false;
+					}
+				}
+
+				surface.clear();
+				if(!newimporter->get_frame(surface,get_canvas()->rend_desc(),Time(0),trimmed,width,height,top,left))
+				{
+					synfig::warning(strprintf("Unable to get frame from \"%s\"",filename_with_path.c_str()));
+				}
+
+				importer=newimporter;
+				filename=newfilename;
+				abs_filename=filename_with_path;
+				param_filename.set(filename);
+
+				return true;
+			}
+		case OPENGL:
+			{
+				return false;
+			}
+		case CAIRO:
+			{
+				
+				if(filename==newfilename && cimporter)
+				{
+					synfig::warning(strprintf(_("Filename seems to already be set to \"%s\" (%s)"),filename.c_str(),newfilename.c_str()));
+					return true;
+				}
+				assert(get_canvas());
+				 
+				FileSystem::Handle file_system = get_canvas()->get_identifier().file_system;
+				if (!file_system) file_system = FileSystemNative::instance();
+
+				// todo: literal "container:"
+				if(is_absolute_path(newfilename_orig)
+				|| newfilename_orig.substr(0, std::string("#").size())=="#")
+					filename_with_path=newfilename_orig;
+				else
+					filename_with_path=absolute_path(get_canvas()->get_file_path()+ETL_DIRECTORY_SEPARATOR+newfilename_orig);
+				 
+				handle<CairoImporter> newimporter;
+				 
+				newimporter=CairoImporter::open(file_system->get_identifier(filename_with_path));
+				 
+				if(!newimporter)
+				{
+					newimporter=CairoImporter::open(file_system->get_identifier(get_canvas()->get_file_path()+ETL_DIRECTORY_SEPARATOR+basename(newfilename_orig)));
+					if(!newimporter)
+					{
+						synfig::error(strprintf("Unable to create an importer object with file \"%s\"",filename_with_path.c_str()));
+						cimporter=0;
+						filename=newfilename;
+						abs_filename=filename_with_path;
+						csurface.set_cairo_surface(NULL);
+						param_filename.set(filename);
+						return false;
+					}
+				}
+				 
+				cairo_surface_t* cs;
+				if(!newimporter->get_frame(cs, get_canvas()->rend_desc(), Time(0), trimmed, width, height, top, left))
+				{
+					synfig::warning(strprintf("Unable to get frame from \"%s\"",filename_with_path.c_str()));
+				}
+				set_cairo_surface(cs);
+				cairo_surface_destroy(cs);
+				 
+				cimporter=newimporter;
+				filename=newfilename;
+				abs_filename=filename_with_path;
+				param_filename.set(filename);
+
+				return true;
+				
+				//return false;
+			}
+		}
+	}
+	IMPORT_VALUE_PLUS_END
+	} catch(...) { set_amount(0); return false; }
+
+	return Layer_Bitmap::set_param(param,value);
+}
+
+ValueBase
+Import::get_param(const String & param)const
+{
+	EXPORT_VALUE(param_time_offset);
+
+	if(get_canvas())
+	{
+		if(param=="filename")
+		{
+			ValueBase ret(type_string);
+			// This line is needed to copy the internals of ValueBase from param_filename
+			ret=param_filename;
+			
+			// todo: literal "container:" and "images"
+			if(ret.get(String()).substr(0, std::string("#").size())!="#") {
+				string curpath(cleanup_path(absolute_path(get_canvas()->get_file_path())));
+				ret=relative_path(curpath,abs_filename);
+			} else
+			if(ret.get(String()).substr(0, std::string("#images/").size())=="#images/") {
+				ret = "#" + ret.get(String()).substr(std::string("#images/").size());
+			}
+
+			return ret;
+		}
+	}
+	else
+		EXPORT_VALUE(param_filename);
+
+	EXPORT_NAME();
+	EXPORT_VERSION();
+
+	return Layer_Bitmap::get_param(param);
+}
+
+Layer::Vocab
+Import::get_param_vocab()const
+{
+	Layer::Vocab ret(Layer_Bitmap::get_param_vocab());
+
+	ret.push_back(ParamDesc("filename")
+		.set_local_name(_("Filename"))
+		.set_description(_("File to import"))
+		.set_hint("filename")
+	);
+	ret.push_back(ParamDesc("time_offset")
+		.set_local_name(_("Time Offset"))
+		.set_description(_("Time Offset to apply to the imported file"))
+	);
+
+	return ret;
+}
+
+void
+Import::set_time(IndependentContext context, Time time)const
+{
+	Time time_offset=param_time_offset.get(Time());
+	switch (get_method())
+	{
+	case SOFTWARE:
+		if(get_amount() && importer &&
+		   importer->is_animated())
+			importer->get_frame(surface,get_canvas()->rend_desc(),time+time_offset,trimmed,width,height,top,left);
+		break;
+	case OPENGL:
+		break;
+	case CAIRO:
+		{
+
+			if(get_amount() && cimporter &&
+			   cimporter->is_animated())
+			{
+				cairo_surface_t* cs;
+				cimporter->get_frame(cs, get_canvas()->rend_desc(), time+time_offset, trimmed, width, height, top, left);
+				if(cs)
+				{
+					csurface.set_cairo_surface(cs);
+					csurface.map_cairo_image();
+					cairo_surface_destroy(cs);
+				}
+			}
+			break;
+
+		}
+	
+	}
+	context.set_time(time);
+}
+
+void
+Import::set_time(IndependentContext context, Time time, const Point &pos)const
+{
+	Time time_offset=param_time_offset.get(Time());
+	switch (get_method())
+	{
+		case SOFTWARE:
+			if(get_amount() && importer &&
+			   importer->is_animated())
+				importer->get_frame(surface,get_canvas()->rend_desc(),time+time_offset,trimmed,width,height,top,left);
+			break;
+		case OPENGL:
+			break;
+		case CAIRO:
+		{
+
+			if(get_amount() && cimporter &&
+			   cimporter->is_animated())
+			{
+				cairo_surface_t* cs;
+				cimporter->get_frame(cs, get_canvas()->rend_desc(), time+time_offset, trimmed, width, height, top, left);
+				if(cs)
+				{
+					csurface.set_cairo_surface(cs);
+					csurface.map_cairo_image();
+					cairo_surface_destroy(cs);
+				}
+			}
+			break;
+
+		}
+			
+	}
+	context.set_time(time,pos);
+}
+
+void
+Import::set_render_method(Context context, RenderMethod x)
+{
+	if(get_method() != x) // if the method is different
+	{
+		Layer_Bitmap::set_render_method(context, x); // set the method (and pass to the other layers)
+		importer=0; // invalidate the importer
+		cimporter=0;
+		set_param("filename", param_filename); // this will update the importer to the new type
+	}
+	else
+		context.set_render_method(x); // pass it down.
+}
diff --git a/src/modules/lyr_std/import.h b/src/modules/lyr_std/import.h
index 7b2aa17..ed3bb6d 100644
--- a/src/modules/lyr_std/import.h
+++ b/src/modules/lyr_std/import.h
@@ -28,7 +28,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include <synfig/layer_bitmap.h>
+#include <synfig/layers/layer_bitmap.h>
 #include <synfig/color.h>
 #include <synfig/vector.h>
 #include <synfig/importer.h>
diff --git a/src/modules/lyr_std/shade.h b/src/modules/lyr_std/shade.h
index a4ad2ff..2b2d9a1 100644
--- a/src/modules/lyr_std/shade.h
+++ b/src/modules/lyr_std/shade.h
@@ -29,7 +29,7 @@
 
 /* -- H E A D E R S --------------------------------------------------------- */
 
-#include <synfig/layer_composite.h>
+#include <synfig/layers/layer_composite.h>
 #include <synfig/color.h>
 #include <synfig/vector.h>
 #include <synfig/blur.h>
diff --git a/src/modules/lyr_std/sphere_distort.h b/src/modules/lyr_std/sphere_distort.h
index 9079101..d8fa31b 100644
--- a/src/modules/lyr_std/sphere_distort.h
+++ b/src/modules/lyr_std/sphere_distort.h
@@ -28,7 +28,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include <synfig/layer_composite.h>
+#include <synfig/layers/layer_composite.h>
 #include <synfig/vector.h>
 #include <synfig/rect.h>
 
diff --git a/src/modules/lyr_std/stroboscope.cpp b/src/modules/lyr_std/stroboscope.cpp
index 745fdf8..c008abe 100644
--- a/src/modules/lyr_std/stroboscope.cpp
+++ b/src/modules/lyr_std/stroboscope.cpp
@@ -36,8 +36,8 @@
 
 #include "stroboscope.h"
 #include <synfig/valuenode.h>
-#include <synfig/valuenode_const.h>
-#include <synfig/valuenode_subtract.h>
+#include <synfig/valuenodes/valuenode_const.h>
+#include <synfig/valuenodes/valuenode_subtract.h>
 #include <synfig/time.h>
 #include <synfig/context.h>
 #include <synfig/paramdesc.h>
diff --git a/src/modules/lyr_std/timeloop.cpp b/src/modules/lyr_std/timeloop.cpp
index 8552499..c1f9809 100644
--- a/src/modules/lyr_std/timeloop.cpp
+++ b/src/modules/lyr_std/timeloop.cpp
@@ -35,8 +35,8 @@
 
 #include "timeloop.h"
 #include <synfig/valuenode.h>
-#include <synfig/valuenode_const.h>
-#include <synfig/valuenode_subtract.h>
+#include <synfig/valuenodes/valuenode_const.h>
+#include <synfig/valuenodes/valuenode_subtract.h>
 #include <synfig/time.h>
 #include <synfig/context.h>
 #include <synfig/paramdesc.h>
diff --git a/src/modules/lyr_std/twirl.h b/src/modules/lyr_std/twirl.h
index 9b20d7b..48cc12d 100644
--- a/src/modules/lyr_std/twirl.h
+++ b/src/modules/lyr_std/twirl.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include <synfig/layer_composite.h>
+#include <synfig/layers/layer_composite.h>
 #include <synfig/color.h>
 #include <synfig/vector.h>
 #include <synfig/value.h>
diff --git a/src/modules/lyr_std/xorpattern.h b/src/modules/lyr_std/xorpattern.h
index fac862b..361f19a 100644
--- a/src/modules/lyr_std/xorpattern.h
+++ b/src/modules/lyr_std/xorpattern.h
@@ -31,7 +31,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include <synfig/layer_composite.h>
+#include <synfig/layers/layer_composite.h>
 #include <synfig/color.h>
 #include <synfig/context.h>
 #include <synfig/vector.h>
diff --git a/src/modules/mod_bmp/Makefile.in b/src/modules/mod_bmp/Makefile.in
index ab56f65..00199dd 100644
--- a/src/modules/mod_bmp/Makefile.in
+++ b/src/modules/mod_bmp/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
 # $Id$
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -81,8 +91,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/modules/mod_bmp
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -101,6 +109,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 =
@@ -224,6 +233,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -479,7 +489,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/mod_bmp/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/modules/mod_bmp/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -547,22 +556,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmod_bmp_la-trgt_bmp.Plo at am__quote@
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
@@ -802,6 +814,8 @@ uninstall-am: uninstall-moduleLTLIBRARIES
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-moduleLTLIBRARIES
 
+.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.
diff --git a/src/modules/mod_dv/Makefile.in b/src/modules/mod_dv/Makefile.in
index 4c90d70..736c5ab 100644
--- a/src/modules/mod_dv/Makefile.in
+++ b/src/modules/mod_dv/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
 # $Id$
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -81,8 +91,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/modules/mod_dv
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -101,6 +109,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 =
@@ -226,6 +235,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -479,7 +489,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/mod_dv/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/modules/mod_dv/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -546,22 +555,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmod_dv_la-trgt_dv.Plo at am__quote@
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
@@ -794,6 +806,8 @@ uninstall-am: uninstall-moduleLTLIBRARIES
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-moduleLTLIBRARIES
 
+.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.
diff --git a/src/modules/mod_example/Makefile.in b/src/modules/mod_example/Makefile.in
index 02b46fe..852ac11 100644
--- a/src/modules/mod_example/Makefile.in
+++ b/src/modules/mod_example/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
 # $Id$
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -81,8 +91,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/modules/mod_example
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -101,6 +109,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 =
@@ -225,6 +234,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -482,7 +492,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/mod_example/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/modules/mod_example/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -551,22 +560,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmod_example_la-simplecircle.Plo at am__quote@
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
@@ -813,6 +825,8 @@ uninstall-am: uninstall-moduleLTLIBRARIES
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-moduleLTLIBRARIES
 
+.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.
diff --git a/src/modules/mod_example/filledrect.h b/src/modules/mod_example/filledrect.h
index a63e720..de43d19 100644
--- a/src/modules/mod_example/filledrect.h
+++ b/src/modules/mod_example/filledrect.h
@@ -27,7 +27,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include <synfig/layer_composite.h>
+#include <synfig/layers/layer_composite.h>
 #include <synfig/color.h>
 #include <synfig/vector.h>
 #include <synfig/value.h>
diff --git a/src/modules/mod_example/metaballs.h b/src/modules/mod_example/metaballs.h
index 93ec494..47d21e2 100644
--- a/src/modules/mod_example/metaballs.h
+++ b/src/modules/mod_example/metaballs.h
@@ -28,7 +28,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include <synfig/layer_composite.h>
+#include <synfig/layers/layer_composite.h>
 #include <synfig/gradient.h>
 #include <synfig/vector.h>
 #include <synfig/value.h>
diff --git a/src/modules/mod_example/simplecircle.h b/src/modules/mod_example/simplecircle.h
index da3a010..2c035e1 100644
--- a/src/modules/mod_example/simplecircle.h
+++ b/src/modules/mod_example/simplecircle.h
@@ -27,10 +27,10 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include <synfig/layer_composite.h>
+#include <synfig/layers/layer_composite.h>
 #include <synfig/color.h>
 #include <synfig/vector.h>
-#include <synfig/layer_composite.h>
+#include <synfig/layers/layer_composite.h>
 #include <synfig/value.h>
 
 /* === M A C R O S ========================================================= */
diff --git a/src/modules/mod_ffmpeg/Makefile.in b/src/modules/mod_ffmpeg/Makefile.in
index ed17a22..c066f19 100644
--- a/src/modules/mod_ffmpeg/Makefile.in
+++ b/src/modules/mod_ffmpeg/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
 # $Id$
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -81,8 +91,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/modules/mod_ffmpeg
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -101,6 +109,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 =
@@ -230,6 +239,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -485,7 +495,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/mod_ffmpeg/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/modules/mod_ffmpeg/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -553,22 +562,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmod_ffmpeg_la-trgt_ffmpeg.Plo at am__quote@
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
@@ -808,6 +820,8 @@ uninstall-am: uninstall-moduleLTLIBRARIES
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-moduleLTLIBRARIES
 
+.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.
diff --git a/src/modules/mod_filter/Makefile.in b/src/modules/mod_filter/Makefile.in
index 9d981a6..aaa834a 100644
--- a/src/modules/mod_filter/Makefile.in
+++ b/src/modules/mod_filter/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
 # $Id$
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -81,8 +91,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/modules/mod_filter
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -101,6 +109,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 =
@@ -227,6 +236,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -491,7 +501,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/mod_filter/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/modules/mod_filter/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -564,22 +573,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmod_filter_la-radialblur.Plo at am__quote@
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
@@ -854,6 +866,8 @@ uninstall-am: uninstall-moduleLTLIBRARIES
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-moduleLTLIBRARIES
 
+.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.
diff --git a/src/modules/mod_filter/blur.h b/src/modules/mod_filter/blur.h
index cb026f0..e009b6f 100644
--- a/src/modules/mod_filter/blur.h
+++ b/src/modules/mod_filter/blur.h
@@ -29,7 +29,7 @@
 
 /* -- H E A D E R S --------------------------------------------------------- */
 
-#include <synfig/layer_composite.h>
+#include <synfig/layers/layer_composite.h>
 #include <synfig/color.h>
 #include <synfig/vector.h>
 #include <synfig/blur.h>
diff --git a/src/modules/mod_filter/halftone2.h b/src/modules/mod_filter/halftone2.h
index 9ae2a83..425108f 100644
--- a/src/modules/mod_filter/halftone2.h
+++ b/src/modules/mod_filter/halftone2.h
@@ -31,7 +31,7 @@
 
 #include <synfig/vector.h>
 #include <synfig/valuenode.h>
-#include <synfig/layer_composite.h>
+#include <synfig/layers/layer_composite.h>
 #include <synfig/time.h>
 #include <synfig/angle.h>
 #include "halftone.h"
diff --git a/src/modules/mod_filter/halftone3.h b/src/modules/mod_filter/halftone3.h
index 5b8783d..d6c315a 100644
--- a/src/modules/mod_filter/halftone3.h
+++ b/src/modules/mod_filter/halftone3.h
@@ -31,7 +31,7 @@
 
 #include <synfig/vector.h>
 #include <synfig/valuenode.h>
-#include <synfig/layer_composite.h>
+#include <synfig/layers/layer_composite.h>
 #include <synfig/time.h>
 #include <synfig/angle.h>
 #include "halftone.h"
diff --git a/src/modules/mod_filter/lumakey.h b/src/modules/mod_filter/lumakey.h
index 2fc344e..ea0299a 100644
--- a/src/modules/mod_filter/lumakey.h
+++ b/src/modules/mod_filter/lumakey.h
@@ -31,7 +31,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include <synfig/layer_composite.h>
+#include <synfig/layers/layer_composite.h>
 #include <synfig/color.h>
 #include <synfig/vector.h>
 
diff --git a/src/modules/mod_filter/radialblur.h b/src/modules/mod_filter/radialblur.h
index a50b917..79fe4e7 100644
--- a/src/modules/mod_filter/radialblur.h
+++ b/src/modules/mod_filter/radialblur.h
@@ -32,7 +32,7 @@
 
 #include <synfig/vector.h>
 #include <synfig/angle.h>
-#include <synfig/layer_composite.h>
+#include <synfig/layers/layer_composite.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/modules/mod_geometry/Makefile.in b/src/modules/mod_geometry/Makefile.in
index 3cc158f..976d626 100644
--- a/src/modules/mod_geometry/Makefile.in
+++ b/src/modules/mod_geometry/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
 # $Id$
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -81,8 +91,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/modules/mod_geometry
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -101,6 +109,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 =
@@ -228,6 +237,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -501,7 +511,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/mod_geometry/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/modules/mod_geometry/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -574,22 +583,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmod_geometry_la-star.Plo at am__quote@
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
@@ -864,6 +876,8 @@ uninstall-am: uninstall-moduleLTLIBRARIES
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-moduleLTLIBRARIES
 
+.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.
diff --git a/src/modules/mod_geometry/advanced_outline.cpp b/src/modules/mod_geometry/advanced_outline.cpp
index 0e43945..72b7eac 100644
--- a/src/modules/mod_geometry/advanced_outline.cpp
+++ b/src/modules/mod_geometry/advanced_outline.cpp
@@ -43,10 +43,10 @@
 #include <ETL/hermite>
 #include <vector>
 
-#include <synfig/valuenode_bline.h>
-#include <synfig/valuenode_wplist.h>
-#include <synfig/valuenode_dilist.h>
-#include <synfig/valuenode_composite.h>
+#include <synfig/valuenodes/valuenode_bline.h>
+#include <synfig/valuenodes/valuenode_wplist.h>
+#include <synfig/valuenodes/valuenode_dilist.h>
+#include <synfig/valuenodes/valuenode_composite.h>
 
 #endif
 
@@ -1173,7 +1173,7 @@ Advanced_Outline::get_param_vocab()const
 	);
 	ret.push_back(ParamDesc("smoothness")
 		.set_local_name(_("Smoothness"))
-		.set_description(_("Determines the interpolation between withpoints. (0) Linear (1) Smooth"))
+		.set_description(_("Determines the interpolation between widthpoints. (0) Linear (1) Smooth"))
 	);
 	ret.push_back(ParamDesc("homogeneous")
 		.set_local_name(_("Homogeneous"))
diff --git a/src/modules/mod_geometry/advanced_outline.h b/src/modules/mod_geometry/advanced_outline.h
index 9395d3d..8234862 100644
--- a/src/modules/mod_geometry/advanced_outline.h
+++ b/src/modules/mod_geometry/advanced_outline.h
@@ -30,7 +30,7 @@
 
 #include <list>
 #include <vector>
-#include <synfig/layer_polygon.h>
+#include <synfig/layers/layer_polygon.h>
 #include <synfig/segment.h>
 #include <synfig/value.h>
 
diff --git a/src/modules/mod_geometry/checkerboard.h b/src/modules/mod_geometry/checkerboard.h
index f29ed06..f1f364d 100644
--- a/src/modules/mod_geometry/checkerboard.h
+++ b/src/modules/mod_geometry/checkerboard.h
@@ -31,7 +31,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include <synfig/layer_composite.h>
+#include <synfig/layers/layer_composite.h>
 #include <synfig/color.h>
 #include <synfig/vector.h>
 
diff --git a/src/modules/mod_geometry/circle.h b/src/modules/mod_geometry/circle.h
index 1e51b24..cf6ddc9 100644
--- a/src/modules/mod_geometry/circle.h
+++ b/src/modules/mod_geometry/circle.h
@@ -29,7 +29,7 @@
 
 /* -- H E A D E R S --------------------------------------------------------- */
 
-#include <synfig/layer_composite.h>
+#include <synfig/layers/layer_composite.h>
 #include <synfig/color.h>
 #include <synfig/vector.h>
 #include <synfig/value.h>
diff --git a/src/modules/mod_geometry/outline.cpp b/src/modules/mod_geometry/outline.cpp
index 357d9ec..f9eab5c 100644
--- a/src/modules/mod_geometry/outline.cpp
+++ b/src/modules/mod_geometry/outline.cpp
@@ -49,7 +49,7 @@
 #include <ETL/hermite>
 #include <vector>
 
-#include <synfig/valuenode_bline.h>
+#include <synfig/valuenodes/valuenode_bline.h>
 
 #endif
 
diff --git a/src/modules/mod_geometry/outline.h b/src/modules/mod_geometry/outline.h
index e93c2cd..d80902c 100644
--- a/src/modules/mod_geometry/outline.h
+++ b/src/modules/mod_geometry/outline.h
@@ -30,7 +30,7 @@
 
 #include <list>
 #include <vector>
-#include <synfig/layer_polygon.h>
+#include <synfig/layers/layer_polygon.h>
 #include <synfig/segment.h>
 #include <synfig/value.h>
 
diff --git a/src/modules/mod_geometry/rectangle.h b/src/modules/mod_geometry/rectangle.h
index 1c68845..9c66525 100644
--- a/src/modules/mod_geometry/rectangle.h
+++ b/src/modules/mod_geometry/rectangle.h
@@ -28,7 +28,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include <synfig/layer_composite.h>
+#include <synfig/layers/layer_composite.h>
 #include <synfig/color.h>
 #include <synfig/vector.h>
 #include <synfig/value.h>
diff --git a/src/modules/mod_geometry/region.cpp b/src/modules/mod_geometry/region.cpp
index 5d8d8eb..79533cd 100644
--- a/src/modules/mod_geometry/region.cpp
+++ b/src/modules/mod_geometry/region.cpp
@@ -47,7 +47,7 @@
 #include <synfig/value.h>
 #include <synfig/valuenode.h>
 #include <synfig/segment.h>
-#include <synfig/valuenode_bline.h>
+#include <synfig/valuenodes/valuenode_bline.h>
 
 #endif
 
diff --git a/src/modules/mod_geometry/region.h b/src/modules/mod_geometry/region.h
index 0249e3d..8a6a158 100644
--- a/src/modules/mod_geometry/region.h
+++ b/src/modules/mod_geometry/region.h
@@ -30,7 +30,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include <synfig/layer_polygon.h>
+#include <synfig/layers/layer_polygon.h>
 #include <list>
 #include <vector>
 #include <synfig/value.h>
diff --git a/src/modules/mod_geometry/star.h b/src/modules/mod_geometry/star.h
index 29918da..54c9cdc 100644
--- a/src/modules/mod_geometry/star.h
+++ b/src/modules/mod_geometry/star.h
@@ -31,7 +31,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include <synfig/layer_polygon.h>
+#include <synfig/layers/layer_polygon.h>
 #include <synfig/value.h>
 #include <list>
 #include <vector>
diff --git a/src/modules/mod_gif/Makefile.in b/src/modules/mod_gif/Makefile.in
index 2a026f5..1717471 100644
--- a/src/modules/mod_gif/Makefile.in
+++ b/src/modules/mod_gif/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
 # $Id$
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -81,8 +91,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/modules/mod_gif
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -101,6 +109,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 =
@@ -224,6 +233,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -477,7 +487,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/mod_gif/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/modules/mod_gif/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -544,22 +553,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmod_gif_la-trgt_gif.Plo at am__quote@
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
@@ -792,6 +804,8 @@ uninstall-am: uninstall-moduleLTLIBRARIES
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-moduleLTLIBRARIES
 
+.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.
diff --git a/src/modules/mod_gradient/Makefile.in b/src/modules/mod_gradient/Makefile.in
index 5504d45..2a44e92 100644
--- a/src/modules/mod_gradient/Makefile.in
+++ b/src/modules/mod_gradient/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
 # $Id$
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -81,8 +91,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/modules/mod_gradient
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -101,6 +109,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 =
@@ -228,6 +237,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -486,7 +496,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/mod_gradient/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/modules/mod_gradient/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -557,22 +566,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmod_gradient_la-spiralgradient.Plo at am__quote@
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
@@ -833,6 +845,8 @@ uninstall-am: uninstall-moduleLTLIBRARIES
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-moduleLTLIBRARIES
 
+.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.
diff --git a/src/modules/mod_gradient/conicalgradient.h b/src/modules/mod_gradient/conicalgradient.h
index 4a3f992..d3e8ab4 100644
--- a/src/modules/mod_gradient/conicalgradient.h
+++ b/src/modules/mod_gradient/conicalgradient.h
@@ -28,7 +28,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include <synfig/layer_composite.h>
+#include <synfig/layers/layer_composite.h>
 #include <synfig/color.h>
 #include <synfig/vector.h>
 #include <synfig/value.h>
diff --git a/src/modules/mod_gradient/curvegradient.h b/src/modules/mod_gradient/curvegradient.h
index 3a0e805..9569d54 100644
--- a/src/modules/mod_gradient/curvegradient.h
+++ b/src/modules/mod_gradient/curvegradient.h
@@ -31,7 +31,7 @@
 /* === H E A D E R S ======================================================= */
 
 #include <synfig/vector.h>
-#include <synfig/layer_composite.h>
+#include <synfig/layers/layer_composite.h>
 #include <synfig/gradient.h>
 #include <synfig/blinepoint.h>
 
diff --git a/src/modules/mod_gradient/lineargradient.h b/src/modules/mod_gradient/lineargradient.h
index 7aa7f91..f6defc5 100644
--- a/src/modules/mod_gradient/lineargradient.h
+++ b/src/modules/mod_gradient/lineargradient.h
@@ -31,7 +31,7 @@
 /* === H E A D E R S ======================================================= */
 
 #include <synfig/vector.h>
-#include <synfig/layer_composite.h>
+#include <synfig/layers/layer_composite.h>
 #include <synfig/gradient.h>
 
 /* === M A C R O S ========================================================= */
diff --git a/src/modules/mod_gradient/radialgradient.h b/src/modules/mod_gradient/radialgradient.h
index 665f953..650786e 100644
--- a/src/modules/mod_gradient/radialgradient.h
+++ b/src/modules/mod_gradient/radialgradient.h
@@ -28,7 +28,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include <synfig/layer_composite.h>
+#include <synfig/layers/layer_composite.h>
 #include <synfig/color.h>
 #include <synfig/vector.h>
 #include <synfig/value.h>
diff --git a/src/modules/mod_gradient/spiralgradient.h b/src/modules/mod_gradient/spiralgradient.h
index d5c8c5b..f81eb0a 100644
--- a/src/modules/mod_gradient/spiralgradient.h
+++ b/src/modules/mod_gradient/spiralgradient.h
@@ -27,7 +27,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include <synfig/layer_composite.h>
+#include <synfig/layers/layer_composite.h>
 #include <synfig/color.h>
 #include <synfig/vector.h>
 #include <synfig/value.h>
diff --git a/src/modules/mod_imagemagick/Makefile.in b/src/modules/mod_imagemagick/Makefile.in
index 077159c..d135709 100644
--- a/src/modules/mod_imagemagick/Makefile.in
+++ b/src/modules/mod_imagemagick/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
 # $Id$
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -81,8 +91,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/modules/mod_imagemagick
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -101,6 +109,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 =
@@ -231,6 +240,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -486,7 +496,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/mod_imagemagick/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/modules/mod_imagemagick/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -554,22 +563,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmod_imagemagick_la-trgt_imagemagick.Plo at am__quote@
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
@@ -809,6 +821,8 @@ uninstall-am: uninstall-moduleLTLIBRARIES
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-moduleLTLIBRARIES
 
+.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.
diff --git a/src/modules/mod_jpeg/Makefile.in b/src/modules/mod_jpeg/Makefile.in
index fc70197..8f9aa8a 100644
--- a/src/modules/mod_jpeg/Makefile.in
+++ b/src/modules/mod_jpeg/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
 # $Id$
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -81,8 +91,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/modules/mod_jpeg
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -101,6 +109,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 =
@@ -229,6 +238,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -485,7 +495,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/mod_jpeg/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/modules/mod_jpeg/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -553,22 +562,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmod_jpeg_la-trgt_jpeg.Plo at am__quote@
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
@@ -808,6 +820,8 @@ uninstall-am: uninstall-moduleLTLIBRARIES
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-moduleLTLIBRARIES
 
+.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.
diff --git a/src/modules/mod_libavcodec/Makefile.in b/src/modules/mod_libavcodec/Makefile.in
index f9a5f67..03a0852 100644
--- a/src/modules/mod_libavcodec/Makefile.in
+++ b/src/modules/mod_libavcodec/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
 # $Id$
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -81,8 +91,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/modules/mod_libavcodec
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -101,6 +109,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 =
@@ -231,6 +240,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -489,7 +499,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/mod_libavcodec/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/modules/mod_libavcodec/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -557,22 +566,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmod_libavcodec_la-trgt_av.Plo at am__quote@
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
@@ -812,6 +824,8 @@ uninstall-am: uninstall-moduleLTLIBRARIES
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-moduleLTLIBRARIES
 
+.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.
diff --git a/src/modules/mod_magickpp/Makefile.in b/src/modules/mod_magickpp/Makefile.in
index 430f2d5..5137d5e 100644
--- a/src/modules/mod_magickpp/Makefile.in
+++ b/src/modules/mod_magickpp/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
 # $Id$
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -81,8 +91,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/modules/mod_magickpp
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -101,6 +109,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 =
@@ -230,6 +239,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -484,7 +494,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/mod_magickpp/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/modules/mod_magickpp/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -551,22 +560,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmod_magickpp_la-trgt_magickpp.Plo at am__quote@
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
@@ -799,6 +811,8 @@ uninstall-am: uninstall-moduleLTLIBRARIES
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-moduleLTLIBRARIES
 
+.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.
diff --git a/src/modules/mod_mng/Makefile.in b/src/modules/mod_mng/Makefile.in
index 7838a54..7fe6cca 100644
--- a/src/modules/mod_mng/Makefile.in
+++ b/src/modules/mod_mng/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
 # $Id$
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -81,8 +91,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/modules/mod_mng
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -101,6 +109,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 =
@@ -227,6 +236,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -483,7 +493,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/mod_mng/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/modules/mod_mng/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -550,22 +559,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmod_mng_la-trgt_mng.Plo at am__quote@
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
@@ -798,6 +810,8 @@ uninstall-am: uninstall-moduleLTLIBRARIES
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-moduleLTLIBRARIES
 
+.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.
diff --git a/src/modules/mod_noise/Makefile.in b/src/modules/mod_noise/Makefile.in
index 2a162de..e80a82c 100644
--- a/src/modules/mod_noise/Makefile.in
+++ b/src/modules/mod_noise/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
 # $Id$
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -81,8 +91,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/modules/mod_noise
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -101,6 +109,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 =
@@ -225,6 +234,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -479,7 +489,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/mod_noise/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/modules/mod_noise/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -549,22 +558,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmod_noise_la-valuenode_random.Plo at am__quote@
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
@@ -818,6 +830,8 @@ uninstall-am: uninstall-moduleLTLIBRARIES
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-moduleLTLIBRARIES
 
+.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.
diff --git a/src/modules/mod_noise/distort.h b/src/modules/mod_noise/distort.h
index 36ec18c..376f0ca 100644
--- a/src/modules/mod_noise/distort.h
+++ b/src/modules/mod_noise/distort.h
@@ -31,7 +31,7 @@
 
 #include <synfig/vector.h>
 #include <synfig/valuenode.h>
-#include <synfig/layer_composite.h>
+#include <synfig/layers/layer_composite.h>
 #include <synfig/gradient.h>
 #include <synfig/time.h>
 #include "random_noise.h"
diff --git a/src/modules/mod_noise/noise.h b/src/modules/mod_noise/noise.h
index 09ca5b4..bde4089 100644
--- a/src/modules/mod_noise/noise.h
+++ b/src/modules/mod_noise/noise.h
@@ -32,7 +32,7 @@
 #include <synfig/vector.h>
 #include <synfig/valuenode.h>
 
-#include <synfig/layer_composite.h>
+#include <synfig/layers/layer_composite.h>
 #include <synfig/gradient.h>
 #include <synfig/time.h>
 #include "random_noise.h"
diff --git a/src/modules/mod_noise/valuenode_random.cpp b/src/modules/mod_noise/valuenode_random.cpp
index 094bbaf..f6e5ffe 100644
--- a/src/modules/mod_noise/valuenode_random.cpp
+++ b/src/modules/mod_noise/valuenode_random.cpp
@@ -32,7 +32,7 @@
 #endif
 
 #include "valuenode_random.h"
-#include "synfig/valuenode_const.h"
+#include "synfig/valuenodes/valuenode_const.h"
 #include "synfig/general.h"
 #include "synfig/color.h"
 #include <ETL/misc>
diff --git a/src/modules/mod_openexr/Makefile.in b/src/modules/mod_openexr/Makefile.in
index 5beb231..2f42528 100644
--- a/src/modules/mod_openexr/Makefile.in
+++ b/src/modules/mod_openexr/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
 # $Id$
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -81,8 +91,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/modules/mod_openexr
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -101,6 +109,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 =
@@ -230,6 +239,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -486,7 +496,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/mod_openexr/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/modules/mod_openexr/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -554,22 +563,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmod_openexr_la-trgt_openexr.Plo at am__quote@
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
@@ -809,6 +821,8 @@ uninstall-am: uninstall-moduleLTLIBRARIES
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-moduleLTLIBRARIES
 
+.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.
diff --git a/src/modules/mod_particle/Makefile.in b/src/modules/mod_particle/Makefile.in
index 8e24e30..0d2a7de 100644
--- a/src/modules/mod_particle/Makefile.in
+++ b/src/modules/mod_particle/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
 # $Id$
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -81,8 +91,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/modules/mod_particle
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -101,6 +109,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 =
@@ -224,6 +233,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -479,7 +489,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/mod_particle/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/modules/mod_particle/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -547,22 +556,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmod_particle_la-random.Plo at am__quote@
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
@@ -802,6 +814,8 @@ uninstall-am: uninstall-moduleLTLIBRARIES
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-moduleLTLIBRARIES
 
+.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.
diff --git a/src/modules/mod_particle/plant.cpp b/src/modules/mod_particle/plant.cpp
index 9b92961..6c57722 100644
--- a/src/modules/mod_particle/plant.cpp
+++ b/src/modules/mod_particle/plant.cpp
@@ -48,7 +48,7 @@
 #include <vector>
 #include <time.h>
 
-#include <synfig/valuenode_bline.h>
+#include <synfig/valuenodes/valuenode_bline.h>
 
 #endif
 
diff --git a/src/modules/mod_particle/plant.h b/src/modules/mod_particle/plant.h
index 4140009..ce4af45 100644
--- a/src/modules/mod_particle/plant.h
+++ b/src/modules/mod_particle/plant.h
@@ -30,7 +30,7 @@
 
 #include <list>
 #include <vector>
-#include <synfig/layer_composite.h>
+#include <synfig/layers/layer_composite.h>
 #include <synfig/segment.h>
 #include <synfig/blinepoint.h>
 #include <synfig/value.h>
diff --git a/src/modules/mod_png/Makefile.in b/src/modules/mod_png/Makefile.in
index 614fadd..2969de5 100644
--- a/src/modules/mod_png/Makefile.in
+++ b/src/modules/mod_png/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
 # $Id$
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -81,8 +91,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/modules/mod_png
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -101,6 +109,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 =
@@ -234,6 +243,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -496,7 +506,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/mod_png/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/modules/mod_png/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -567,22 +576,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmod_png_la-trgt_png_spritesheet.Plo at am__quote@
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
@@ -843,6 +855,8 @@ uninstall-am: uninstall-moduleLTLIBRARIES
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-moduleLTLIBRARIES
 
+.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.
diff --git a/src/modules/mod_png/mptr_png.cpp b/src/modules/mod_png/mptr_png.cpp
index 52711a1..d185024 100644
--- a/src/modules/mod_png/mptr_png.cpp
+++ b/src/modules/mod_png/mptr_png.cpp
@@ -292,24 +292,28 @@ png_mptr::png_mptr(const synfig::FileSystem::Identifier &identifier):
 		break;
 
 	case PNG_COLOR_TYPE_PALETTE:
+	{
+        png_colorp palette;
+        int num_palette;
+	    png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette);
+	    png_bytep trans_alpha = NULL;
+	    int num_trans = 0;
+	    bool has_alpha = (png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans,
+	                                   NULL) & PNG_INFO_tRNS);
 		for(y=0;y<height;y++)
 			for(x=0;x<width;x++)
 			{
-				png_colorp palette;
-				int num_palette;
-				png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette);
 				float r=gamma().r_U8_to_F32((unsigned char)palette[row_pointers[y][x]].red);
 				float g=gamma().g_U8_to_F32((unsigned char)palette[row_pointers[y][x]].green);
 				float b=gamma().b_U8_to_F32((unsigned char)palette[row_pointers[y][x]].blue);
 				float a=1.0;
-				if(png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
-				{
-					png_bytep trans_alpha;
-					int num_trans;
-					png_color_16p trans_color;
-					png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color);
-					a = (float)(unsigned char)trans_alpha[row_pointers[y][x]]*(1.0/255.0);
-				}
+
+                if (has_alpha && num_trans > 0 && trans_alpha != NULL)
+                {
+                    a = row_pointers[y][x] < num_trans ?
+                            (trans_alpha[row_pointers[y][x]]*(1.0/255.0)) : 1.0;
+                }
+
 				surface_buffer[y][x]=Color(
 					r,
 					g,
@@ -318,6 +322,7 @@ png_mptr::png_mptr(const synfig::FileSystem::Identifier &identifier):
 				);
 			}
 		break;
+	}
 	default:
 		png_read_end(png_ptr, end_info);
 		png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
diff --git a/src/modules/mod_png/trgt_png_spritesheet.cpp b/src/modules/mod_png/trgt_png_spritesheet.cpp
index 2ed0270..fcdd212 100644
--- a/src/modules/mod_png/trgt_png_spritesheet.cpp
+++ b/src/modules/mod_png/trgt_png_spritesheet.cpp
@@ -203,7 +203,7 @@ png_trgt_spritesheet::end_frame()
 	cur_y = 0;
 	if (params.dir == TargetParam::HR)
 	{
-		//Horisontal render. Columns increment
+		//Horizontal render. Columns increment
 		cur_col++;
 		if (cur_col >= (unsigned int)params.columns)
 		{
diff --git a/src/modules/mod_ppm/Makefile.in b/src/modules/mod_ppm/Makefile.in
index 04dd786..0b24c49 100644
--- a/src/modules/mod_ppm/Makefile.in
+++ b/src/modules/mod_ppm/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
 # $Id$
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -81,8 +91,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/modules/mod_ppm
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -101,6 +109,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 =
@@ -224,6 +233,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -476,7 +486,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/mod_ppm/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/modules/mod_ppm/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -544,22 +553,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmod_ppm_la-trgt_ppm.Plo at am__quote@
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
@@ -799,6 +811,8 @@ uninstall-am: uninstall-moduleLTLIBRARIES
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-moduleLTLIBRARIES
 
+.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.
diff --git a/src/modules/mod_svg/Makefile.in b/src/modules/mod_svg/Makefile.in
index 6a034f8..4811717 100644
--- a/src/modules/mod_svg/Makefile.in
+++ b/src/modules/mod_svg/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
 # $Id$
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -81,8 +91,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/modules/mod_svg
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -101,6 +109,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 =
@@ -224,6 +233,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -456,7 +466,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/mod_svg/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/modules/mod_svg/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -524,22 +533,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmod_svg_la-svg_parser.Plo at am__quote@
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
@@ -779,6 +791,8 @@ uninstall-am: uninstall-moduleLTLIBRARIES
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-moduleLTLIBRARIES
 
+.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.
diff --git a/src/modules/mod_svg/layer_svg.h b/src/modules/mod_svg/layer_svg.h
index 20a38cd..e198a79 100644
--- a/src/modules/mod_svg/layer_svg.h
+++ b/src/modules/mod_svg/layer_svg.h
@@ -30,7 +30,7 @@
 
 #include <synfig/color.h>
 #include <synfig/vector.h>
-#include <synfig/layer_group.h>
+#include <synfig/layers/layer_group.h>
 #include <synfig/value.h>
 
 #include "svg_parser.h"
diff --git a/src/modules/mod_yuv420p/Makefile.in b/src/modules/mod_yuv420p/Makefile.in
index 07b12de..1722efe 100644
--- a/src/modules/mod_yuv420p/Makefile.in
+++ b/src/modules/mod_yuv420p/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
 # $Id$
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -81,8 +91,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/modules/mod_yuv420p
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -101,6 +109,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 =
@@ -224,6 +233,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -476,7 +486,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/mod_yuv420p/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/modules/mod_yuv420p/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -543,22 +552,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmod_yuv420p_la-trgt_yuv.Plo at am__quote@
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
@@ -791,6 +803,8 @@ uninstall-am: uninstall-moduleLTLIBRARIES
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-moduleLTLIBRARIES
 
+.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.
diff --git a/src/synfig/Makefile.am b/src/synfig/Makefile.am
index d9f8caf..f7267bc 100644
--- a/src/synfig/Makefile.am
+++ b/src/synfig/Makefile.am
@@ -15,41 +15,6 @@ EXTRA_DIST = \
 	nodebase.h
 
 
-LAYERHEADERS = \
-	layer_bitmap.h \
-	layer_composite.h \
-	layer_duplicate.h \
-	layer_group.h \
-	layer_meshtransform.h \
-	layer_mime.h \
-	layer_motionblur.h \
-	layer_pastecanvas.h \
-	layer_polygon.h \
-	layer_shape.h \
-	layer_solidcolor.h \
-	layer_sound.h \
-	layer_skeleton.h \
-	layer_skeletondeformation.h \
-	layer_switch.h
-
-LAYERSOURCES = \
-	layer_bitmap.cpp \
-	layer_composite.cpp \
-	layer_duplicate.cpp \
-	layer_group.cpp \
-	layer_meshtransform.cpp \
-	layer_mime.cpp \
-	layer_motionblur.cpp \
-	layer_pastecanvas.cpp \
-	layer_polygon.cpp \
-	layer_shape.cpp \
-	layer_solidcolor.cpp \
-	layer_sound.cpp \
-	layer_skeleton.cpp \
-	layer_skeletondeformation.cpp \
-	layer_switch.cpp
-
-
 TARGETHEADERS = \
 	target_multi.h \
 	target_null.h \
@@ -79,136 +44,6 @@ IMPORTERSOURCES = \
 	cairolistimporter.cpp
 
 
-VALUENODEHEADERS = \
-	valuenode_add.h \
-	valuenode_and.h \
-	valuenode_anglestring.h \
-	valuenode_animated.h \
-	valuenode_atan2.h \
-	valuenode_bline.h \
-	valuenode_blinecalctangent.h \
-	valuenode_blinecalcvertex.h \
-	valuenode_blinecalcwidth.h \
-	valuenode_blinereversetangent.h \
-	valuenode_compare.h \
-	valuenode_composite.h \
-	valuenode_const.h \
-	valuenode_cos.h \
-	valuenode_dilist.h \
-	valuenode_dotproduct.h \
-	valuenode_duplicate.h \
-	valuenode_dynamiclist.h \
-	valuenode_exp.h \
-	valuenode_gradientcolor.h \
-	valuenode_gradientrotate.h \
-	valuenode_greyed.h \
-	valuenode_integer.h \
-	valuenode_intstring.h \
-	valuenode_join.h \
-	valuenode_linear.h \
-	valuenode_log.h \
-	valuenode_not.h \
-	valuenode_or.h \
-	valuenode_pow.h \
-	valuenode_radialcomposite.h \
-	valuenode_range.h \
-	valuenode_real.h \
-	valuenode_realstring.h \
-	valuenode_reciprocal.h \
-	valuenode_reference.h \
-	valuenode_repeat_gradient.h \
-	valuenode_scale.h \
-	valuenode_segcalctangent.h \
-	valuenode_segcalcvertex.h \
-	valuenode_sine.h \
-	valuenode_step.h \
-	valuenode_stripes.h \
-	valuenode_subtract.h \
-	valuenode_switch.h \
-	valuenode_timedswap.h \
-	valuenode_timeloop.h \
-	valuenode_timestring.h \
-	valuenode_twotone.h \
-	valuenode_vectorangle.h \
-	valuenode_vectorlength.h \
-	valuenode_vectorx.h \
-	valuenode_vectory.h \
-	valuenode_boneinfluence.h \
-	valuenode_staticlist.h \
-	valuenode_bone.h \
-	valuenode_boneweightpair.h\
-	valuenode_wplist.h \
-	valuenode_bonelink.h \
-	valuenode_average.h \
-	valuenode_dynamic.h \
-	valuenode_derivative.h \
-	valuenode_weightedaverage.h
-
-VALUENODESOURCES = \
-	valuenode_add.cpp \
-	valuenode_and.cpp \
-	valuenode_anglestring.cpp \
-	valuenode_animated.cpp \
-	valuenode_atan2.cpp \
-	valuenode_bline.cpp \
-	valuenode_blinecalctangent.cpp \
-	valuenode_blinecalcvertex.cpp \
-	valuenode_blinecalcwidth.cpp \
-	valuenode_blinereversetangent.cpp \
-	valuenode_compare.cpp \
-	valuenode_composite.cpp \
-	valuenode_const.cpp \
-	valuenode_cos.cpp \
-	valuenode_dilist.cpp \
-	valuenode_dotproduct.cpp \
-	valuenode_duplicate.cpp \
-	valuenode_dynamiclist.cpp \
-	valuenode_exp.cpp \
-	valuenode_gradientcolor.cpp \
-	valuenode_gradientrotate.cpp \
-	valuenode_greyed.cpp \
-	valuenode_integer.cpp \
-	valuenode_intstring.cpp \
-	valuenode_join.cpp \
-	valuenode_linear.cpp \
-	valuenode_log.cpp \
-	valuenode_not.cpp \
-	valuenode_or.cpp \
-	valuenode_pow.cpp \
-	valuenode_radialcomposite.cpp \
-	valuenode_range.cpp \
-	valuenode_real.cpp \
-	valuenode_realstring.cpp \
-	valuenode_reciprocal.cpp \
-	valuenode_reference.cpp \
-	valuenode_repeat_gradient.cpp \
-	valuenode_scale.cpp \
-	valuenode_segcalctangent.cpp \
-	valuenode_segcalcvertex.cpp \
-	valuenode_sine.cpp \
-	valuenode_step.cpp \
-	valuenode_stripes.cpp \
-	valuenode_subtract.cpp \
-	valuenode_switch.cpp \
-	valuenode_timedswap.cpp \
-	valuenode_timeloop.cpp \
-	valuenode_timestring.cpp \
-	valuenode_twotone.cpp \
-	valuenode_vectorangle.cpp \
-	valuenode_vectorlength.cpp \
-	valuenode_vectorx.cpp \
-	valuenode_vectory.cpp \
-	valuenode_boneinfluence.cpp \
-	valuenode_staticlist.cpp \
-	valuenode_bone.cpp \
-	valuenode_boneweightpair.cpp\
-	valuenode_wplist.cpp \
-	valuenode_bonelink.cpp \
-	valuenode_average.cpp\
-	valuenode_dynamic.cpp \
-	valuenode_derivative.cpp \
-	valuenode_weightedaverage.cpp
-
 VALUEHEADERS = \
 	blinepoint.h \
 	widthpoint.h \
@@ -311,7 +146,6 @@ SYNFIGSOURCES = \
 	cairo_operators.cpp \
 	cairo_renddesc.cpp \
 	canvas.cpp \
-	color.cpp \
 	context.cpp \
 	curve_helper.cpp \
 	curveset.cpp \
@@ -358,22 +192,35 @@ SYNFIGSOURCES = \
 	soundprocessor.cpp
 
 
-lib_LTLIBRARIES = libsynfig.la
-
-libsynfig_la_SOURCES = \
+libsynfig_src = \
 	$(VALUEHEADERS) \
 	$(VALUESOURCES) \
-	$(LAYERSOURCES) \
-	$(LAYERHEADERS) \
 	$(TARGETHEADERS) \
 	$(TARGETSOURCES) \
-	$(VALUENODEHEADERS) \
-	$(VALUENODESOURCES) \
 	$(SYNFIGHEADERS) \
 	$(SYNFIGSOURCES) \
 	$(IMPORTERHEADERS) \
 	$(IMPORTERSOURCES)
 
+libsynfig_include_HH = \
+	$(SYNFIGHEADERS) \
+	$(TARGETHEADERS) \
+	$(IMPORTERHEADERS) \
+	$(VALUEHEADERS)
+
+include color/Makefile_insert
+include layers/Makefile_insert
+include valuenodes/Makefile_insert
+
+lib_LTLIBRARIES = libsynfig.la
+
+libsynfig_la_SOURCES = \
+	$(libsynfig_src)
+
+nobase_include_synfig_HEADERS = \
+	$(libsynfig_include_HH)
+
+
 libsynfig_la_LIBADD = \
 	@LIBLTDL@ \
 	@SYNFIG_LIBS@ \
@@ -392,10 +239,3 @@ libsynfig_la_LDFLAGS = \
 
 include_synfigdir = @synfigincludedir@/synfig
 
-include_synfig_HEADERS = \
-	$(SYNFIGHEADERS) \
-	$(LAYERHEADERS) \
-	$(TARGETHEADERS) \
-	$(VALUENODEHEADERS) \
-	$(IMPORTERHEADERS) \
-	$(VALUEHEADERS)
diff --git a/src/synfig/Makefile.in b/src/synfig/Makefile.in
index 3e4fe9f..b916faf 100644
--- a/src/synfig/Makefile.in
+++ b/src/synfig/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -18,7 +18,17 @@
 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -82,8 +92,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/synfig
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/depcomp $(include_synfig_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -102,6 +110,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(nobase_include_synfig_HEADERS) \
+	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -142,100 +152,30 @@ am__objects_2 = libsynfig_la-blinepoint.lo libsynfig_la-widthpoint.lo \
 	libsynfig_la-dashitem.lo libsynfig_la-gradient.lo \
 	libsynfig_la-type.lo libsynfig_la-base_types.lo \
 	libsynfig_la-value.lo
-am__objects_3 = libsynfig_la-layer_bitmap.lo \
-	libsynfig_la-layer_composite.lo \
-	libsynfig_la-layer_duplicate.lo libsynfig_la-layer_group.lo \
-	libsynfig_la-layer_meshtransform.lo libsynfig_la-layer_mime.lo \
-	libsynfig_la-layer_motionblur.lo \
-	libsynfig_la-layer_pastecanvas.lo \
-	libsynfig_la-layer_polygon.lo libsynfig_la-layer_shape.lo \
-	libsynfig_la-layer_solidcolor.lo libsynfig_la-layer_sound.lo \
-	libsynfig_la-layer_skeleton.lo \
-	libsynfig_la-layer_skeletondeformation.lo \
-	libsynfig_la-layer_switch.lo
-am__objects_4 = libsynfig_la-target_multi.lo \
+am__objects_3 = libsynfig_la-target_multi.lo \
 	libsynfig_la-target_null.lo libsynfig_la-target_null_tile.lo \
 	libsynfig_la-target_scanline.lo libsynfig_la-target_cairo.lo \
 	libsynfig_la-target_tile.lo libsynfig_la-target_cairo_tile.lo
-am__objects_5 = libsynfig_la-valuenode_add.lo \
-	libsynfig_la-valuenode_and.lo \
-	libsynfig_la-valuenode_anglestring.lo \
-	libsynfig_la-valuenode_animated.lo \
-	libsynfig_la-valuenode_atan2.lo \
-	libsynfig_la-valuenode_bline.lo \
-	libsynfig_la-valuenode_blinecalctangent.lo \
-	libsynfig_la-valuenode_blinecalcvertex.lo \
-	libsynfig_la-valuenode_blinecalcwidth.lo \
-	libsynfig_la-valuenode_blinereversetangent.lo \
-	libsynfig_la-valuenode_compare.lo \
-	libsynfig_la-valuenode_composite.lo \
-	libsynfig_la-valuenode_const.lo libsynfig_la-valuenode_cos.lo \
-	libsynfig_la-valuenode_dilist.lo \
-	libsynfig_la-valuenode_dotproduct.lo \
-	libsynfig_la-valuenode_duplicate.lo \
-	libsynfig_la-valuenode_dynamiclist.lo \
-	libsynfig_la-valuenode_exp.lo \
-	libsynfig_la-valuenode_gradientcolor.lo \
-	libsynfig_la-valuenode_gradientrotate.lo \
-	libsynfig_la-valuenode_greyed.lo \
-	libsynfig_la-valuenode_integer.lo \
-	libsynfig_la-valuenode_intstring.lo \
-	libsynfig_la-valuenode_join.lo \
-	libsynfig_la-valuenode_linear.lo libsynfig_la-valuenode_log.lo \
-	libsynfig_la-valuenode_not.lo libsynfig_la-valuenode_or.lo \
-	libsynfig_la-valuenode_pow.lo \
-	libsynfig_la-valuenode_radialcomposite.lo \
-	libsynfig_la-valuenode_range.lo libsynfig_la-valuenode_real.lo \
-	libsynfig_la-valuenode_realstring.lo \
-	libsynfig_la-valuenode_reciprocal.lo \
-	libsynfig_la-valuenode_reference.lo \
-	libsynfig_la-valuenode_repeat_gradient.lo \
-	libsynfig_la-valuenode_scale.lo \
-	libsynfig_la-valuenode_segcalctangent.lo \
-	libsynfig_la-valuenode_segcalcvertex.lo \
-	libsynfig_la-valuenode_sine.lo libsynfig_la-valuenode_step.lo \
-	libsynfig_la-valuenode_stripes.lo \
-	libsynfig_la-valuenode_subtract.lo \
-	libsynfig_la-valuenode_switch.lo \
-	libsynfig_la-valuenode_timedswap.lo \
-	libsynfig_la-valuenode_timeloop.lo \
-	libsynfig_la-valuenode_timestring.lo \
-	libsynfig_la-valuenode_twotone.lo \
-	libsynfig_la-valuenode_vectorangle.lo \
-	libsynfig_la-valuenode_vectorlength.lo \
-	libsynfig_la-valuenode_vectorx.lo \
-	libsynfig_la-valuenode_vectory.lo \
-	libsynfig_la-valuenode_boneinfluence.lo \
-	libsynfig_la-valuenode_staticlist.lo \
-	libsynfig_la-valuenode_bone.lo \
-	libsynfig_la-valuenode_boneweightpair.lo \
-	libsynfig_la-valuenode_wplist.lo \
-	libsynfig_la-valuenode_bonelink.lo \
-	libsynfig_la-valuenode_average.lo \
-	libsynfig_la-valuenode_dynamic.lo \
-	libsynfig_la-valuenode_derivative.lo \
-	libsynfig_la-valuenode_weightedaverage.lo
-am__objects_6 = libsynfig_la-activepoint.lo libsynfig_la-bone.lo \
+am__objects_4 = libsynfig_la-activepoint.lo libsynfig_la-bone.lo \
 	libsynfig_la-blur.lo libsynfig_la-cairo_operators.lo \
 	libsynfig_la-cairo_renddesc.lo libsynfig_la-canvas.lo \
-	libsynfig_la-color.lo libsynfig_la-context.lo \
-	libsynfig_la-curve_helper.lo libsynfig_la-curveset.lo \
-	libsynfig_la-distance.lo libsynfig_la-exception.lo \
-	libsynfig_la-gamma.lo libsynfig_la-guid.lo \
-	libsynfig_la-importer.lo libsynfig_la-cairoimporter.lo \
-	libsynfig_la-keyframe.lo libsynfig_la-layer.lo \
-	libsynfig_la-loadcanvas.lo libsynfig_la-main.lo \
-	libsynfig_la-module.lo libsynfig_la-mutex.lo \
-	libsynfig_la-node.lo libsynfig_la-palette.lo \
-	libsynfig_la-paramdesc.lo libsynfig_la-polynomial_root.lo \
-	libsynfig_la-rect.lo libsynfig_la-renddesc.lo \
-	libsynfig_la-render.lo libsynfig_la-savecanvas.lo \
-	libsynfig_la-surface.lo libsynfig_la-target.lo \
-	libsynfig_la-time.lo libsynfig_la-timepointcollect.lo \
-	libsynfig_la-transform.lo libsynfig_la-uniqueid.lo \
-	libsynfig_la-valuenode.lo libsynfig_la-waypoint.lo \
-	libsynfig_la-matrix.lo libsynfig_la-filesystem.lo \
-	libsynfig_la-filesystemnative.lo \
+	libsynfig_la-context.lo libsynfig_la-curve_helper.lo \
+	libsynfig_la-curveset.lo libsynfig_la-distance.lo \
+	libsynfig_la-exception.lo libsynfig_la-gamma.lo \
+	libsynfig_la-guid.lo libsynfig_la-importer.lo \
+	libsynfig_la-cairoimporter.lo libsynfig_la-keyframe.lo \
+	libsynfig_la-layer.lo libsynfig_la-loadcanvas.lo \
+	libsynfig_la-main.lo libsynfig_la-module.lo \
+	libsynfig_la-mutex.lo libsynfig_la-node.lo \
+	libsynfig_la-palette.lo libsynfig_la-paramdesc.lo \
+	libsynfig_la-polynomial_root.lo libsynfig_la-rect.lo \
+	libsynfig_la-renddesc.lo libsynfig_la-render.lo \
+	libsynfig_la-savecanvas.lo libsynfig_la-surface.lo \
+	libsynfig_la-target.lo libsynfig_la-time.lo \
+	libsynfig_la-timepointcollect.lo libsynfig_la-transform.lo \
+	libsynfig_la-uniqueid.lo libsynfig_la-valuenode.lo \
+	libsynfig_la-waypoint.lo libsynfig_la-matrix.lo \
+	libsynfig_la-filesystem.lo libsynfig_la-filesystemnative.lo \
 	libsynfig_la-filesystemgroup.lo libsynfig_la-filecontainer.lo \
 	libsynfig_la-filecontainerzip.lo \
 	libsynfig_la-filecontainertemporary.lo \
@@ -243,13 +183,96 @@ am__objects_6 = libsynfig_la-activepoint.lo libsynfig_la-bone.lo \
 	libsynfig_la-mesh.lo libsynfig_la-renderer.lo \
 	libsynfig_la-renderersoftware.lo \
 	libsynfig_la-soundprocessor.lo
-am__objects_7 = libsynfig_la-listimporter.lo \
+am__objects_5 = libsynfig_la-listimporter.lo \
 	libsynfig_la-cairolistimporter.lo
-am_libsynfig_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
-	$(am__objects_3) $(am__objects_1) $(am__objects_1) \
-	$(am__objects_4) $(am__objects_1) $(am__objects_5) \
-	$(am__objects_1) $(am__objects_6) $(am__objects_1) \
-	$(am__objects_7)
+am__dirstamp = $(am__leading_dot)dirstamp
+am__objects_6 = color/libsynfig_la-color.lo \
+	color/libsynfig_la-cairocolor.lo
+am__objects_7 = layers/libsynfig_la-layer_bitmap.lo \
+	layers/libsynfig_la-layer_composite.lo \
+	layers/libsynfig_la-layer_duplicate.lo \
+	layers/libsynfig_la-layer_group.lo \
+	layers/libsynfig_la-layer_meshtransform.lo \
+	layers/libsynfig_la-layer_mime.lo \
+	layers/libsynfig_la-layer_motionblur.lo \
+	layers/libsynfig_la-layer_pastecanvas.lo \
+	layers/libsynfig_la-layer_polygon.lo \
+	layers/libsynfig_la-layer_shape.lo \
+	layers/libsynfig_la-layer_solidcolor.lo \
+	layers/libsynfig_la-layer_sound.lo \
+	layers/libsynfig_la-layer_skeleton.lo \
+	layers/libsynfig_la-layer_skeletondeformation.lo \
+	layers/libsynfig_la-layer_switch.lo
+am__objects_8 = valuenodes/libsynfig_la-valuenode_add.lo \
+	valuenodes/libsynfig_la-valuenode_and.lo \
+	valuenodes/libsynfig_la-valuenode_anglestring.lo \
+	valuenodes/libsynfig_la-valuenode_animated.lo \
+	valuenodes/libsynfig_la-valuenode_atan2.lo \
+	valuenodes/libsynfig_la-valuenode_bline.lo \
+	valuenodes/libsynfig_la-valuenode_blinecalctangent.lo \
+	valuenodes/libsynfig_la-valuenode_blinecalcvertex.lo \
+	valuenodes/libsynfig_la-valuenode_blinecalcwidth.lo \
+	valuenodes/libsynfig_la-valuenode_blinereversetangent.lo \
+	valuenodes/libsynfig_la-valuenode_compare.lo \
+	valuenodes/libsynfig_la-valuenode_composite.lo \
+	valuenodes/libsynfig_la-valuenode_const.lo \
+	valuenodes/libsynfig_la-valuenode_cos.lo \
+	valuenodes/libsynfig_la-valuenode_dilist.lo \
+	valuenodes/libsynfig_la-valuenode_dotproduct.lo \
+	valuenodes/libsynfig_la-valuenode_duplicate.lo \
+	valuenodes/libsynfig_la-valuenode_dynamiclist.lo \
+	valuenodes/libsynfig_la-valuenode_exp.lo \
+	valuenodes/libsynfig_la-valuenode_gradientcolor.lo \
+	valuenodes/libsynfig_la-valuenode_gradientrotate.lo \
+	valuenodes/libsynfig_la-valuenode_greyed.lo \
+	valuenodes/libsynfig_la-valuenode_integer.lo \
+	valuenodes/libsynfig_la-valuenode_intstring.lo \
+	valuenodes/libsynfig_la-valuenode_join.lo \
+	valuenodes/libsynfig_la-valuenode_linear.lo \
+	valuenodes/libsynfig_la-valuenode_log.lo \
+	valuenodes/libsynfig_la-valuenode_not.lo \
+	valuenodes/libsynfig_la-valuenode_or.lo \
+	valuenodes/libsynfig_la-valuenode_pow.lo \
+	valuenodes/libsynfig_la-valuenode_radialcomposite.lo \
+	valuenodes/libsynfig_la-valuenode_range.lo \
+	valuenodes/libsynfig_la-valuenode_real.lo \
+	valuenodes/libsynfig_la-valuenode_realstring.lo \
+	valuenodes/libsynfig_la-valuenode_reciprocal.lo \
+	valuenodes/libsynfig_la-valuenode_reference.lo \
+	valuenodes/libsynfig_la-valuenode_repeat_gradient.lo \
+	valuenodes/libsynfig_la-valuenode_reverse.lo \
+	valuenodes/libsynfig_la-valuenode_scale.lo \
+	valuenodes/libsynfig_la-valuenode_segcalctangent.lo \
+	valuenodes/libsynfig_la-valuenode_segcalcvertex.lo \
+	valuenodes/libsynfig_la-valuenode_sine.lo \
+	valuenodes/libsynfig_la-valuenode_step.lo \
+	valuenodes/libsynfig_la-valuenode_stripes.lo \
+	valuenodes/libsynfig_la-valuenode_subtract.lo \
+	valuenodes/libsynfig_la-valuenode_switch.lo \
+	valuenodes/libsynfig_la-valuenode_timedswap.lo \
+	valuenodes/libsynfig_la-valuenode_timeloop.lo \
+	valuenodes/libsynfig_la-valuenode_timestring.lo \
+	valuenodes/libsynfig_la-valuenode_twotone.lo \
+	valuenodes/libsynfig_la-valuenode_vectorangle.lo \
+	valuenodes/libsynfig_la-valuenode_vectorlength.lo \
+	valuenodes/libsynfig_la-valuenode_vectorx.lo \
+	valuenodes/libsynfig_la-valuenode_vectory.lo \
+	valuenodes/libsynfig_la-valuenode_boneinfluence.lo \
+	valuenodes/libsynfig_la-valuenode_staticlist.lo \
+	valuenodes/libsynfig_la-valuenode_bone.lo \
+	valuenodes/libsynfig_la-valuenode_boneweightpair.lo \
+	valuenodes/libsynfig_la-valuenode_wplist.lo \
+	valuenodes/libsynfig_la-valuenode_bonelink.lo \
+	valuenodes/libsynfig_la-valuenode_average.lo \
+	valuenodes/libsynfig_la-valuenode_dynamic.lo \
+	valuenodes/libsynfig_la-valuenode_derivative.lo \
+	valuenodes/libsynfig_la-valuenode_weightedaverage.lo
+am__objects_9 = $(am__objects_1) $(am__objects_2) $(am__objects_1) \
+	$(am__objects_3) $(am__objects_1) $(am__objects_4) \
+	$(am__objects_1) $(am__objects_5) $(am__objects_1) \
+	$(am__objects_6) $(am__objects_1) $(am__objects_7) \
+	$(am__objects_1) $(am__objects_8)
+am_libsynfig_la_OBJECTS = $(am__objects_9)
 libsynfig_la_OBJECTS = $(am_libsynfig_la_OBJECTS)
 AM_V_lt = $(am__v_lt_ at AM_V@)
 am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
@@ -317,7 +340,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-HEADERS = $(include_synfig_HEADERS)
+HEADERS = $(nobase_include_synfig_HEADERS)
 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
@@ -337,6 +360,11 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(srcdir)/color/Makefile_insert \
+	$(srcdir)/layers/Makefile_insert \
+	$(srcdir)/valuenodes/Makefile_insert \
+	$(top_srcdir)/config/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -558,40 +586,6 @@ EXTRA_DIST = \
 	synfig.h \
 	nodebase.h
 
-LAYERHEADERS = \
-	layer_bitmap.h \
-	layer_composite.h \
-	layer_duplicate.h \
-	layer_group.h \
-	layer_meshtransform.h \
-	layer_mime.h \
-	layer_motionblur.h \
-	layer_pastecanvas.h \
-	layer_polygon.h \
-	layer_shape.h \
-	layer_solidcolor.h \
-	layer_sound.h \
-	layer_skeleton.h \
-	layer_skeletondeformation.h \
-	layer_switch.h
-
-LAYERSOURCES = \
-	layer_bitmap.cpp \
-	layer_composite.cpp \
-	layer_duplicate.cpp \
-	layer_group.cpp \
-	layer_meshtransform.cpp \
-	layer_mime.cpp \
-	layer_motionblur.cpp \
-	layer_pastecanvas.cpp \
-	layer_polygon.cpp \
-	layer_shape.cpp \
-	layer_solidcolor.cpp \
-	layer_sound.cpp \
-	layer_skeleton.cpp \
-	layer_skeletondeformation.cpp \
-	layer_switch.cpp
-
 TARGETHEADERS = \
 	target_multi.h \
 	target_null.h \
@@ -619,136 +613,6 @@ IMPORTERSOURCES = \
 	listimporter.cpp \
 	cairolistimporter.cpp
 
-VALUENODEHEADERS = \
-	valuenode_add.h \
-	valuenode_and.h \
-	valuenode_anglestring.h \
-	valuenode_animated.h \
-	valuenode_atan2.h \
-	valuenode_bline.h \
-	valuenode_blinecalctangent.h \
-	valuenode_blinecalcvertex.h \
-	valuenode_blinecalcwidth.h \
-	valuenode_blinereversetangent.h \
-	valuenode_compare.h \
-	valuenode_composite.h \
-	valuenode_const.h \
-	valuenode_cos.h \
-	valuenode_dilist.h \
-	valuenode_dotproduct.h \
-	valuenode_duplicate.h \
-	valuenode_dynamiclist.h \
-	valuenode_exp.h \
-	valuenode_gradientcolor.h \
-	valuenode_gradientrotate.h \
-	valuenode_greyed.h \
-	valuenode_integer.h \
-	valuenode_intstring.h \
-	valuenode_join.h \
-	valuenode_linear.h \
-	valuenode_log.h \
-	valuenode_not.h \
-	valuenode_or.h \
-	valuenode_pow.h \
-	valuenode_radialcomposite.h \
-	valuenode_range.h \
-	valuenode_real.h \
-	valuenode_realstring.h \
-	valuenode_reciprocal.h \
-	valuenode_reference.h \
-	valuenode_repeat_gradient.h \
-	valuenode_scale.h \
-	valuenode_segcalctangent.h \
-	valuenode_segcalcvertex.h \
-	valuenode_sine.h \
-	valuenode_step.h \
-	valuenode_stripes.h \
-	valuenode_subtract.h \
-	valuenode_switch.h \
-	valuenode_timedswap.h \
-	valuenode_timeloop.h \
-	valuenode_timestring.h \
-	valuenode_twotone.h \
-	valuenode_vectorangle.h \
-	valuenode_vectorlength.h \
-	valuenode_vectorx.h \
-	valuenode_vectory.h \
-	valuenode_boneinfluence.h \
-	valuenode_staticlist.h \
-	valuenode_bone.h \
-	valuenode_boneweightpair.h\
-	valuenode_wplist.h \
-	valuenode_bonelink.h \
-	valuenode_average.h \
-	valuenode_dynamic.h \
-	valuenode_derivative.h \
-	valuenode_weightedaverage.h
-
-VALUENODESOURCES = \
-	valuenode_add.cpp \
-	valuenode_and.cpp \
-	valuenode_anglestring.cpp \
-	valuenode_animated.cpp \
-	valuenode_atan2.cpp \
-	valuenode_bline.cpp \
-	valuenode_blinecalctangent.cpp \
-	valuenode_blinecalcvertex.cpp \
-	valuenode_blinecalcwidth.cpp \
-	valuenode_blinereversetangent.cpp \
-	valuenode_compare.cpp \
-	valuenode_composite.cpp \
-	valuenode_const.cpp \
-	valuenode_cos.cpp \
-	valuenode_dilist.cpp \
-	valuenode_dotproduct.cpp \
-	valuenode_duplicate.cpp \
-	valuenode_dynamiclist.cpp \
-	valuenode_exp.cpp \
-	valuenode_gradientcolor.cpp \
-	valuenode_gradientrotate.cpp \
-	valuenode_greyed.cpp \
-	valuenode_integer.cpp \
-	valuenode_intstring.cpp \
-	valuenode_join.cpp \
-	valuenode_linear.cpp \
-	valuenode_log.cpp \
-	valuenode_not.cpp \
-	valuenode_or.cpp \
-	valuenode_pow.cpp \
-	valuenode_radialcomposite.cpp \
-	valuenode_range.cpp \
-	valuenode_real.cpp \
-	valuenode_realstring.cpp \
-	valuenode_reciprocal.cpp \
-	valuenode_reference.cpp \
-	valuenode_repeat_gradient.cpp \
-	valuenode_scale.cpp \
-	valuenode_segcalctangent.cpp \
-	valuenode_segcalcvertex.cpp \
-	valuenode_sine.cpp \
-	valuenode_step.cpp \
-	valuenode_stripes.cpp \
-	valuenode_subtract.cpp \
-	valuenode_switch.cpp \
-	valuenode_timedswap.cpp \
-	valuenode_timeloop.cpp \
-	valuenode_timestring.cpp \
-	valuenode_twotone.cpp \
-	valuenode_vectorangle.cpp \
-	valuenode_vectorlength.cpp \
-	valuenode_vectorx.cpp \
-	valuenode_vectory.cpp \
-	valuenode_boneinfluence.cpp \
-	valuenode_staticlist.cpp \
-	valuenode_bone.cpp \
-	valuenode_boneweightpair.cpp\
-	valuenode_wplist.cpp \
-	valuenode_bonelink.cpp \
-	valuenode_average.cpp\
-	valuenode_dynamic.cpp \
-	valuenode_derivative.cpp \
-	valuenode_weightedaverage.cpp
-
 VALUEHEADERS = \
 	blinepoint.h \
 	widthpoint.h \
@@ -850,7 +714,6 @@ SYNFIGSOURCES = \
 	cairo_operators.cpp \
 	cairo_renddesc.cpp \
 	canvas.cpp \
-	color.cpp \
 	context.cpp \
 	curve_helper.cpp \
 	curveset.cpp \
@@ -896,20 +759,200 @@ SYNFIGSOURCES = \
 	renderersoftware.cpp \
 	soundprocessor.cpp
 
+libsynfig_src = $(VALUEHEADERS) $(VALUESOURCES) $(TARGETHEADERS) \
+	$(TARGETSOURCES) $(SYNFIGHEADERS) $(SYNFIGSOURCES) \
+	$(IMPORTERHEADERS) $(IMPORTERSOURCES) $(COLOR_HH) \
+	color/colorblendingfunctions.h \
+	color/cairocolorblendingfunctions.h $(COLOR_CC) $(LAYERS_HH) \
+	$(LAYERS_CC) $(VALUENODES_HH) $(VALUENODES_CC)
+libsynfig_include_HH = $(SYNFIGHEADERS) $(TARGETHEADERS) \
+	$(IMPORTERHEADERS) $(VALUEHEADERS) $(COLOR_HH) $(LAYERS_HH) \
+	$(VALUENODES_HH)
+COLOR_HH = \
+	color/color.h \
+	color/color.hpp \
+	color/coloraccumulator.h \
+	color/cairocolor.h \
+	color/cairocoloraccumulator.h \
+	color/pixelformat.h \
+	color/common.h
+
+COLOR_CC = \
+	color/color.cpp \
+	color/cairocolor.cpp
+
+LAYERS_HH = \
+	layers/layer_bitmap.h \
+	layers/layer_composite.h \
+	layers/layer_duplicate.h \
+	layers/layer_group.h \
+	layers/layer_meshtransform.h \
+	layers/layer_mime.h \
+	layers/layer_motionblur.h \
+	layers/layer_pastecanvas.h \
+	layers/layer_polygon.h \
+	layers/layer_shape.h \
+	layers/layer_solidcolor.h \
+	layers/layer_sound.h \
+	layers/layer_skeleton.h \
+	layers/layer_skeletondeformation.h \
+	layers/layer_switch.h
+
+LAYERS_CC = \
+	layers/layer_bitmap.cpp \
+	layers/layer_composite.cpp \
+	layers/layer_duplicate.cpp \
+	layers/layer_group.cpp \
+	layers/layer_meshtransform.cpp \
+	layers/layer_mime.cpp \
+	layers/layer_motionblur.cpp \
+	layers/layer_pastecanvas.cpp \
+	layers/layer_polygon.cpp \
+	layers/layer_shape.cpp \
+	layers/layer_solidcolor.cpp \
+	layers/layer_sound.cpp \
+	layers/layer_skeleton.cpp \
+	layers/layer_skeletondeformation.cpp \
+	layers/layer_switch.cpp
+
+VALUENODES_HH = \
+	valuenodes/valuenode_add.h \
+	valuenodes/valuenode_and.h \
+	valuenodes/valuenode_anglestring.h \
+	valuenodes/valuenode_animated.h \
+	valuenodes/valuenode_atan2.h \
+	valuenodes/valuenode_bline.h \
+	valuenodes/valuenode_blinecalctangent.h \
+	valuenodes/valuenode_blinecalcvertex.h \
+	valuenodes/valuenode_blinecalcwidth.h \
+	valuenodes/valuenode_blinereversetangent.h \
+	valuenodes/valuenode_compare.h \
+	valuenodes/valuenode_composite.h \
+	valuenodes/valuenode_const.h \
+	valuenodes/valuenode_cos.h \
+	valuenodes/valuenode_dilist.h \
+	valuenodes/valuenode_dotproduct.h \
+	valuenodes/valuenode_duplicate.h \
+	valuenodes/valuenode_dynamiclist.h \
+	valuenodes/valuenode_exp.h \
+	valuenodes/valuenode_gradientcolor.h \
+	valuenodes/valuenode_gradientrotate.h \
+	valuenodes/valuenode_greyed.h \
+	valuenodes/valuenode_integer.h \
+	valuenodes/valuenode_intstring.h \
+	valuenodes/valuenode_join.h \
+	valuenodes/valuenode_linear.h \
+	valuenodes/valuenode_log.h \
+	valuenodes/valuenode_not.h \
+	valuenodes/valuenode_or.h \
+	valuenodes/valuenode_pow.h \
+	valuenodes/valuenode_radialcomposite.h \
+	valuenodes/valuenode_range.h \
+	valuenodes/valuenode_real.h \
+	valuenodes/valuenode_realstring.h \
+	valuenodes/valuenode_reciprocal.h \
+	valuenodes/valuenode_reference.h \
+	valuenodes/valuenode_repeat_gradient.h \
+	valuenodes/valuenode_reverse.h \
+	valuenodes/valuenode_scale.h \
+	valuenodes/valuenode_segcalctangent.h \
+	valuenodes/valuenode_segcalcvertex.h \
+	valuenodes/valuenode_sine.h \
+	valuenodes/valuenode_step.h \
+	valuenodes/valuenode_stripes.h \
+	valuenodes/valuenode_subtract.h \
+	valuenodes/valuenode_switch.h \
+	valuenodes/valuenode_timedswap.h \
+	valuenodes/valuenode_timeloop.h \
+	valuenodes/valuenode_timestring.h \
+	valuenodes/valuenode_twotone.h \
+	valuenodes/valuenode_vectorangle.h \
+	valuenodes/valuenode_vectorlength.h \
+	valuenodes/valuenode_vectorx.h \
+	valuenodes/valuenode_vectory.h \
+	valuenodes/valuenode_boneinfluence.h \
+	valuenodes/valuenode_staticlist.h \
+	valuenodes/valuenode_bone.h \
+	valuenodes/valuenode_boneweightpair.h\
+	valuenodes/valuenode_wplist.h \
+	valuenodes/valuenode_bonelink.h \
+	valuenodes/valuenode_average.h \
+	valuenodes/valuenode_dynamic.h \
+	valuenodes/valuenode_derivative.h \
+	valuenodes/valuenode_weightedaverage.h
+
+VALUENODES_CC = \
+	valuenodes/valuenode_add.cpp \
+	valuenodes/valuenode_and.cpp \
+	valuenodes/valuenode_anglestring.cpp \
+	valuenodes/valuenode_animated.cpp \
+	valuenodes/valuenode_atan2.cpp \
+	valuenodes/valuenode_bline.cpp \
+	valuenodes/valuenode_blinecalctangent.cpp \
+	valuenodes/valuenode_blinecalcvertex.cpp \
+	valuenodes/valuenode_blinecalcwidth.cpp \
+	valuenodes/valuenode_blinereversetangent.cpp \
+	valuenodes/valuenode_compare.cpp \
+	valuenodes/valuenode_composite.cpp \
+	valuenodes/valuenode_const.cpp \
+	valuenodes/valuenode_cos.cpp \
+	valuenodes/valuenode_dilist.cpp \
+	valuenodes/valuenode_dotproduct.cpp \
+	valuenodes/valuenode_duplicate.cpp \
+	valuenodes/valuenode_dynamiclist.cpp \
+	valuenodes/valuenode_exp.cpp \
+	valuenodes/valuenode_gradientcolor.cpp \
+	valuenodes/valuenode_gradientrotate.cpp \
+	valuenodes/valuenode_greyed.cpp \
+	valuenodes/valuenode_integer.cpp \
+	valuenodes/valuenode_intstring.cpp \
+	valuenodes/valuenode_join.cpp \
+	valuenodes/valuenode_linear.cpp \
+	valuenodes/valuenode_log.cpp \
+	valuenodes/valuenode_not.cpp \
+	valuenodes/valuenode_or.cpp \
+	valuenodes/valuenode_pow.cpp \
+	valuenodes/valuenode_radialcomposite.cpp \
+	valuenodes/valuenode_range.cpp \
+	valuenodes/valuenode_real.cpp \
+	valuenodes/valuenode_realstring.cpp \
+	valuenodes/valuenode_reciprocal.cpp \
+	valuenodes/valuenode_reference.cpp \
+	valuenodes/valuenode_repeat_gradient.cpp \
+	valuenodes/valuenode_reverse.cpp \
+	valuenodes/valuenode_scale.cpp \
+	valuenodes/valuenode_segcalctangent.cpp \
+	valuenodes/valuenode_segcalcvertex.cpp \
+	valuenodes/valuenode_sine.cpp \
+	valuenodes/valuenode_step.cpp \
+	valuenodes/valuenode_stripes.cpp \
+	valuenodes/valuenode_subtract.cpp \
+	valuenodes/valuenode_switch.cpp \
+	valuenodes/valuenode_timedswap.cpp \
+	valuenodes/valuenode_timeloop.cpp \
+	valuenodes/valuenode_timestring.cpp \
+	valuenodes/valuenode_twotone.cpp \
+	valuenodes/valuenode_vectorangle.cpp \
+	valuenodes/valuenode_vectorlength.cpp \
+	valuenodes/valuenode_vectorx.cpp \
+	valuenodes/valuenode_vectory.cpp \
+	valuenodes/valuenode_boneinfluence.cpp \
+	valuenodes/valuenode_staticlist.cpp \
+	valuenodes/valuenode_bone.cpp \
+	valuenodes/valuenode_boneweightpair.cpp\
+	valuenodes/valuenode_wplist.cpp \
+	valuenodes/valuenode_bonelink.cpp \
+	valuenodes/valuenode_average.cpp\
+	valuenodes/valuenode_dynamic.cpp \
+	valuenodes/valuenode_derivative.cpp \
+	valuenodes/valuenode_weightedaverage.cpp
+
 lib_LTLIBRARIES = libsynfig.la
 libsynfig_la_SOURCES = \
-	$(VALUEHEADERS) \
-	$(VALUESOURCES) \
-	$(LAYERSOURCES) \
-	$(LAYERHEADERS) \
-	$(TARGETHEADERS) \
-	$(TARGETSOURCES) \
-	$(VALUENODEHEADERS) \
-	$(VALUENODESOURCES) \
-	$(SYNFIGHEADERS) \
-	$(SYNFIGSOURCES) \
-	$(IMPORTERHEADERS) \
-	$(IMPORTERSOURCES)
+	$(libsynfig_src)
+
+nobase_include_synfig_HEADERS = \
+	$(libsynfig_include_HH)
 
 libsynfig_la_LIBADD = \
 	@LIBLTDL@ \
@@ -927,19 +970,11 @@ libsynfig_la_LDFLAGS = \
 	-version-info 0:0:0
 
 include_synfigdir = @synfigincludedir@/synfig
-include_synfig_HEADERS = \
-	$(SYNFIGHEADERS) \
-	$(LAYERHEADERS) \
-	$(TARGETHEADERS) \
-	$(VALUENODEHEADERS) \
-	$(IMPORTERHEADERS) \
-	$(VALUEHEADERS)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/color/Makefile_insert $(srcdir)/layers/Makefile_insert $(srcdir)/valuenodes/Makefile_insert $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -951,7 +986,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/synfig/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/synfig/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -960,6 +994,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(srcdir)/color/Makefile_insert $(srcdir)/layers/Makefile_insert $(srcdir)/valuenodes/Makefile_insert $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1004,12 +1039,249 @@ clean-libLTLIBRARIES:
 	  echo rm -f $${locs}; \
 	  rm -f $${locs}; \
 	}
+color/$(am__dirstamp):
+	@$(MKDIR_P) color
+	@: > color/$(am__dirstamp)
+color/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) color/$(DEPDIR)
+	@: > color/$(DEPDIR)/$(am__dirstamp)
+color/libsynfig_la-color.lo: color/$(am__dirstamp) \
+	color/$(DEPDIR)/$(am__dirstamp)
+color/libsynfig_la-cairocolor.lo: color/$(am__dirstamp) \
+	color/$(DEPDIR)/$(am__dirstamp)
+layers/$(am__dirstamp):
+	@$(MKDIR_P) layers
+	@: > layers/$(am__dirstamp)
+layers/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) layers/$(DEPDIR)
+	@: > layers/$(DEPDIR)/$(am__dirstamp)
+layers/libsynfig_la-layer_bitmap.lo: layers/$(am__dirstamp) \
+	layers/$(DEPDIR)/$(am__dirstamp)
+layers/libsynfig_la-layer_composite.lo: layers/$(am__dirstamp) \
+	layers/$(DEPDIR)/$(am__dirstamp)
+layers/libsynfig_la-layer_duplicate.lo: layers/$(am__dirstamp) \
+	layers/$(DEPDIR)/$(am__dirstamp)
+layers/libsynfig_la-layer_group.lo: layers/$(am__dirstamp) \
+	layers/$(DEPDIR)/$(am__dirstamp)
+layers/libsynfig_la-layer_meshtransform.lo: layers/$(am__dirstamp) \
+	layers/$(DEPDIR)/$(am__dirstamp)
+layers/libsynfig_la-layer_mime.lo: layers/$(am__dirstamp) \
+	layers/$(DEPDIR)/$(am__dirstamp)
+layers/libsynfig_la-layer_motionblur.lo: layers/$(am__dirstamp) \
+	layers/$(DEPDIR)/$(am__dirstamp)
+layers/libsynfig_la-layer_pastecanvas.lo: layers/$(am__dirstamp) \
+	layers/$(DEPDIR)/$(am__dirstamp)
+layers/libsynfig_la-layer_polygon.lo: layers/$(am__dirstamp) \
+	layers/$(DEPDIR)/$(am__dirstamp)
+layers/libsynfig_la-layer_shape.lo: layers/$(am__dirstamp) \
+	layers/$(DEPDIR)/$(am__dirstamp)
+layers/libsynfig_la-layer_solidcolor.lo: layers/$(am__dirstamp) \
+	layers/$(DEPDIR)/$(am__dirstamp)
+layers/libsynfig_la-layer_sound.lo: layers/$(am__dirstamp) \
+	layers/$(DEPDIR)/$(am__dirstamp)
+layers/libsynfig_la-layer_skeleton.lo: layers/$(am__dirstamp) \
+	layers/$(DEPDIR)/$(am__dirstamp)
+layers/libsynfig_la-layer_skeletondeformation.lo:  \
+	layers/$(am__dirstamp) layers/$(DEPDIR)/$(am__dirstamp)
+layers/libsynfig_la-layer_switch.lo: layers/$(am__dirstamp) \
+	layers/$(DEPDIR)/$(am__dirstamp)
+valuenodes/$(am__dirstamp):
+	@$(MKDIR_P) valuenodes
+	@: > valuenodes/$(am__dirstamp)
+valuenodes/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) valuenodes/$(DEPDIR)
+	@: > valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_add.lo: valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_and.lo: valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_anglestring.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_animated.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_atan2.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_bline.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_blinecalctangent.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_blinecalcvertex.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_blinecalcwidth.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_blinereversetangent.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_compare.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_composite.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_const.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_cos.lo: valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_dilist.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_dotproduct.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_duplicate.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_dynamiclist.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_exp.lo: valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_gradientcolor.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_gradientrotate.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_greyed.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_integer.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_intstring.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_join.lo: valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_linear.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_log.lo: valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_not.lo: valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_or.lo: valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_pow.lo: valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_radialcomposite.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_range.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_real.lo: valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_realstring.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_reciprocal.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_reference.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_repeat_gradient.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_reverse.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_scale.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_segcalctangent.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_segcalcvertex.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_sine.lo: valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_step.lo: valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_stripes.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_subtract.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_switch.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_timedswap.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_timeloop.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_timestring.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_twotone.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_vectorangle.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_vectorlength.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_vectorx.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_vectory.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_boneinfluence.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_staticlist.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_bone.lo: valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_boneweightpair.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_wplist.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_bonelink.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_average.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_dynamic.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_derivative.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
+valuenodes/libsynfig_la-valuenode_weightedaverage.lo:  \
+	valuenodes/$(am__dirstamp) \
+	valuenodes/$(DEPDIR)/$(am__dirstamp)
 
 libsynfig.la: $(libsynfig_la_OBJECTS) $(libsynfig_la_DEPENDENCIES) $(EXTRA_libsynfig_la_DEPENDENCIES) 
 	$(AM_V_CXXLD)$(libsynfig_la_LINK) -rpath $(libdir) $(libsynfig_la_OBJECTS) $(libsynfig_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
+	-rm -f color/*.$(OBJEXT)
+	-rm -f color/*.lo
+	-rm -f layers/*.$(OBJEXT)
+	-rm -f layers/*.lo
+	-rm -f valuenodes/*.$(OBJEXT)
+	-rm -f valuenodes/*.lo
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -1024,7 +1296,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-cairoimporter.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-cairolistimporter.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-canvas.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-color.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-context.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-curve_helper.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-curveset.Plo at am__quote@
@@ -1043,21 +1314,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-importer.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-keyframe.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-layer.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-layer_bitmap.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-layer_composite.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-layer_duplicate.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-layer_group.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-layer_meshtransform.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-layer_mime.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-layer_motionblur.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-layer_pastecanvas.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-layer_polygon.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-layer_shape.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-layer_skeleton.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-layer_skeletondeformation.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-layer_solidcolor.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-layer_sound.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-layer_switch.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-listimporter.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-loadcanvas.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-main.Plo at am__quote@
@@ -1092,91 +1348,112 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-uniqueid.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-value.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_add.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_and.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_anglestring.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_animated.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_atan2.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_average.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_bline.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_blinecalctangent.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_blinecalcvertex.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_blinecalcwidth.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_blinereversetangent.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_bone.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_boneinfluence.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_bonelink.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_boneweightpair.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_compare.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_composite.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_const.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_cos.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_derivative.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_dilist.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_dotproduct.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_duplicate.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_dynamic.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_dynamiclist.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_exp.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_gradientcolor.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_gradientrotate.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_greyed.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_integer.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_intstring.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_join.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_linear.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_log.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_not.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_or.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_pow.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_radialcomposite.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_range.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_real.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_realstring.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_reciprocal.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_reference.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_repeat_gradient.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_scale.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_segcalctangent.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_segcalcvertex.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_sine.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_staticlist.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_step.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_stripes.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_subtract.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_switch.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_timedswap.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_timeloop.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_timestring.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_twotone.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_vectorangle.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_vectorlength.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_vectorx.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_vectory.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_weightedaverage.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valuenode_wplist.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-valueoperations.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-waypoint.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-widthpoint.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsynfig_la-zstreambuf.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at color/$(DEPDIR)/libsynfig_la-cairocolor.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at color/$(DEPDIR)/libsynfig_la-color.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at layers/$(DEPDIR)/libsynfig_la-layer_bitmap.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at layers/$(DEPDIR)/libsynfig_la-layer_composite.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at layers/$(DEPDIR)/libsynfig_la-layer_duplicate.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at layers/$(DEPDIR)/libsynfig_la-layer_group.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at layers/$(DEPDIR)/libsynfig_la-layer_meshtransform.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at layers/$(DEPDIR)/libsynfig_la-layer_mime.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at layers/$(DEPDIR)/libsynfig_la-layer_motionblur.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at layers/$(DEPDIR)/libsynfig_la-layer_pastecanvas.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at layers/$(DEPDIR)/libsynfig_la-layer_polygon.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at layers/$(DEPDIR)/libsynfig_la-layer_shape.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at layers/$(DEPDIR)/libsynfig_la-layer_skeleton.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at layers/$(DEPDIR)/libsynfig_la-layer_skeletondeformation.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at layers/$(DEPDIR)/libsynfig_la-layer_solidcolor.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at layers/$(DEPDIR)/libsynfig_la-layer_sound.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at layers/$(DEPDIR)/libsynfig_la-layer_switch.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_add.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_and.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_anglestring.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_animated.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_atan2.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_average.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_bline.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_blinecalctangent.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_blinecalcvertex.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_blinecalcwidth.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_blinereversetangent.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_bone.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_boneinfluence.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_bonelink.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_boneweightpair.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_compare.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_composite.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_const.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_cos.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_derivative.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_dilist.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_dotproduct.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_duplicate.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_dynamic.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_dynamiclist.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_exp.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_gradientcolor.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_gradientrotate.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_greyed.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_integer.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_intstring.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_join.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_linear.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_log.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_not.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_or.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_pow.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_radialcomposite.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_range.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_real.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_realstring.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_reciprocal.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_reference.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_repeat_gradient.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_reverse.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_scale.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_segcalctangent.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_segcalcvertex.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_sine.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_staticlist.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_step.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_stripes.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_subtract.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_switch.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_timedswap.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_timeloop.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_timestring.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_twotone.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_vectorangle.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_vectorlength.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_vectorx.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_vectory.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_weightedaverage.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at valuenodes/$(DEPDIR)/libsynfig_la-valuenode_wplist.Plo at am__quote@
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
@@ -1230,111 +1507,6 @@ libsynfig_la-value.lo: value.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-value.lo `test -f 'value.cpp' || echo '$(srcdir)/'`value.cpp
 
-libsynfig_la-layer_bitmap.lo: layer_bitmap.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-layer_bitmap.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-layer_bitmap.Tpo -c -o libsynfig_la-layer_bitmap.lo `test -f 'layer_bitmap.cpp' || echo '$(srcdir)/'`layer_bitmap.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-layer_bitmap.Tpo $(DEPDIR)/libsynfig_la-layer_bitmap.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layer_bitmap.cpp' object='libsynfig_la-layer_bitmap.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-layer_bitmap.lo `test -f 'layer_bitmap.cpp' || echo '$(srcdir)/'`layer_bitmap.cpp
-
-libsynfig_la-layer_composite.lo: layer_composite.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-layer_composite.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-layer_composite.Tpo -c -o libsynfig_la-layer_composite.lo `test -f 'layer_composite.cpp' || echo '$(srcdir)/'`layer_composite.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-layer_composite.Tpo $(DEPDIR)/libsynfig_la-layer_composite.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layer_composite.cpp' object='libsynfig_la-layer_composite.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-layer_composite.lo `test -f 'layer_composite.cpp' || echo '$(srcdir)/'`layer_composite.cpp
-
-libsynfig_la-layer_duplicate.lo: layer_duplicate.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-layer_duplicate.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-layer_duplicate.Tpo -c -o libsynfig_la-layer_duplicate.lo `test -f 'layer_duplicate.cpp' || echo '$(srcdir)/'`layer_duplicate.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-layer_duplicate.Tpo $(DEPDIR)/libsynfig_la-layer_duplicate.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layer_duplicate.cpp' object='libsynfig_la-layer_duplicate.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-layer_duplicate.lo `test -f 'layer_duplicate.cpp' || echo '$(srcdir)/'`layer_duplicate.cpp
-
-libsynfig_la-layer_group.lo: layer_group.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-layer_group.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-layer_group.Tpo -c -o libsynfig_la-layer_group.lo `test -f 'layer_group.cpp' || echo '$(srcdir)/'`layer_group.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-layer_group.Tpo $(DEPDIR)/libsynfig_la-layer_group.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layer_group.cpp' object='libsynfig_la-layer_group.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-layer_group.lo `test -f 'layer_group.cpp' || echo '$(srcdir)/'`layer_group.cpp
-
-libsynfig_la-layer_meshtransform.lo: layer_meshtransform.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-layer_meshtransform.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-layer_meshtransform.Tpo -c -o libsynfig_la-layer_meshtransform.lo `test -f 'layer_meshtransform.cpp' || echo '$(srcdir)/'`layer_meshtransform.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-layer_meshtransform.Tpo $(DEPDIR)/libsynfig_la-layer_meshtransform.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layer_meshtransform.cpp' object='libsynfig_la-layer_meshtransform.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-layer_meshtransform.lo `test -f 'layer_meshtransform.cpp' || echo '$(srcdir)/'`layer_meshtransform.cpp
-
-libsynfig_la-layer_mime.lo: layer_mime.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-layer_mime.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-layer_mime.Tpo -c -o libsynfig_la-layer_mime.lo `test -f 'layer_mime.cpp' || echo '$(srcdir)/'`layer_mime.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-layer_mime.Tpo $(DEPDIR)/libsynfig_la-layer_mime.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layer_mime.cpp' object='libsynfig_la-layer_mime.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-layer_mime.lo `test -f 'layer_mime.cpp' || echo '$(srcdir)/'`layer_mime.cpp
-
-libsynfig_la-layer_motionblur.lo: layer_motionblur.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-layer_motionblur.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-layer_motionblur.Tpo -c -o libsynfig_la-layer_motionblur.lo `test -f 'layer_motionblur.cpp' || echo '$(srcdir)/'`layer_motionblur.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-layer_motionblur.Tpo $(DEPDIR)/libsynfig_la-layer_motionblur.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layer_motionblur.cpp' object='libsynfig_la-layer_motionblur.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-layer_motionblur.lo `test -f 'layer_motionblur.cpp' || echo '$(srcdir)/'`layer_motionblur.cpp
-
-libsynfig_la-layer_pastecanvas.lo: layer_pastecanvas.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-layer_pastecanvas.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-layer_pastecanvas.Tpo -c -o libsynfig_la-layer_pastecanvas.lo `test -f 'layer_pastecanvas.cpp' || echo '$(srcdir)/'`layer_pastecanvas.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-layer_pastecanvas.Tpo $(DEPDIR)/libsynfig_la-layer_pastecanvas.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layer_pastecanvas.cpp' object='libsynfig_la-layer_pastecanvas.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-layer_pastecanvas.lo `test -f 'layer_pastecanvas.cpp' || echo '$(srcdir)/'`layer_pastecanvas.cpp
-
-libsynfig_la-layer_polygon.lo: layer_polygon.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-layer_polygon.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-layer_polygon.Tpo -c -o libsynfig_la-layer_polygon.lo `test -f 'layer_polygon.cpp' || echo '$(srcdir)/'`layer_polygon.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-layer_polygon.Tpo $(DEPDIR)/libsynfig_la-layer_polygon.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layer_polygon.cpp' object='libsynfig_la-layer_polygon.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-layer_polygon.lo `test -f 'layer_polygon.cpp' || echo '$(srcdir)/'`layer_polygon.cpp
-
-libsynfig_la-layer_shape.lo: layer_shape.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-layer_shape.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-layer_shape.Tpo -c -o libsynfig_la-layer_shape.lo `test -f 'layer_shape.cpp' || echo '$(srcdir)/'`layer_shape.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-layer_shape.Tpo $(DEPDIR)/libsynfig_la-layer_shape.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layer_shape.cpp' object='libsynfig_la-layer_shape.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-layer_shape.lo `test -f 'layer_shape.cpp' || echo '$(srcdir)/'`layer_shape.cpp
-
-libsynfig_la-layer_solidcolor.lo: layer_solidcolor.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-layer_solidcolor.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-layer_solidcolor.Tpo -c -o libsynfig_la-layer_solidcolor.lo `test -f 'layer_solidcolor.cpp' || echo '$(srcdir)/'`layer_solidcolor.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-layer_solidcolor.Tpo $(DEPDIR)/libsynfig_la-layer_solidcolor.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layer_solidcolor.cpp' object='libsynfig_la-layer_solidcolor.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-layer_solidcolor.lo `test -f 'layer_solidcolor.cpp' || echo '$(srcdir)/'`layer_solidcolor.cpp
-
-libsynfig_la-layer_sound.lo: layer_sound.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-layer_sound.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-layer_sound.Tpo -c -o libsynfig_la-layer_sound.lo `test -f 'layer_sound.cpp' || echo '$(srcdir)/'`layer_sound.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-layer_sound.Tpo $(DEPDIR)/libsynfig_la-layer_sound.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layer_sound.cpp' object='libsynfig_la-layer_sound.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-layer_sound.lo `test -f 'layer_sound.cpp' || echo '$(srcdir)/'`layer_sound.cpp
-
-libsynfig_la-layer_skeleton.lo: layer_skeleton.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-layer_skeleton.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-layer_skeleton.Tpo -c -o libsynfig_la-layer_skeleton.lo `test -f 'layer_skeleton.cpp' || echo '$(srcdir)/'`layer_skeleton.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-layer_skeleton.Tpo $(DEPDIR)/libsynfig_la-layer_skeleton.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layer_skeleton.cpp' object='libsynfig_la-layer_skeleton.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-layer_skeleton.lo `test -f 'layer_skeleton.cpp' || echo '$(srcdir)/'`layer_skeleton.cpp
-
-libsynfig_la-layer_skeletondeformation.lo: layer_skeletondeformation.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-layer_skeletondeformation.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-layer_skeletondeformation.Tpo -c -o libsynfig_la-layer_skeletondeformation.lo `test -f 'layer_skeletondeformation.cpp' || echo '$(srcdir)/'`layer_skeletondeformation.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-layer_skeletondeformation.Tpo $(DEPDIR)/libsynfig_la-layer_skeletondeformation.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layer_skeletondeformation.cpp' object='libsynfig_la-layer_skeletondeformation.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-layer_skeletondeformation.lo `test -f 'layer_skeletondeformation.cpp' || echo '$(srcdir)/'`layer_skeletondeformation.cpp
-
-libsynfig_la-layer_switch.lo: layer_switch.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-layer_switch.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-layer_switch.Tpo -c -o libsynfig_la-layer_switch.lo `test -f 'layer_switch.cpp' || echo '$(srcdir)/'`layer_switch.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-layer_switch.Tpo $(DEPDIR)/libsynfig_la-layer_switch.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layer_switch.cpp' object='libsynfig_la-layer_switch.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-layer_switch.lo `test -f 'layer_switch.cpp' || echo '$(srcdir)/'`layer_switch.cpp
-
 libsynfig_la-target_multi.lo: target_multi.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-target_multi.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-target_multi.Tpo -c -o libsynfig_la-target_multi.lo `test -f 'target_multi.cpp' || echo '$(srcdir)/'`target_multi.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-target_multi.Tpo $(DEPDIR)/libsynfig_la-target_multi.Plo
@@ -1384,447 +1556,6 @@ libsynfig_la-target_cairo_tile.lo: target_cairo_tile.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-target_cairo_tile.lo `test -f 'target_cairo_tile.cpp' || echo '$(srcdir)/'`target_cairo_tile.cpp
 
-libsynfig_la-valuenode_add.lo: valuenode_add.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_add.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_add.Tpo -c -o libsynfig_la-valuenode_add.lo `test -f 'valuenode_add.cpp' || echo '$(srcdir)/'`valuenode_add.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_add.Tpo $(DEPDIR)/libsynfig_la-valuenode_add.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_add.cpp' object='libsynfig_la-valuenode_add.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_add.lo `test -f 'valuenode_add.cpp' || echo '$(srcdir)/'`valuenode_add.cpp
-
-libsynfig_la-valuenode_and.lo: valuenode_and.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_and.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_and.Tpo -c -o libsynfig_la-valuenode_and.lo `test -f 'valuenode_and.cpp' || echo '$(srcdir)/'`valuenode_and.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_and.Tpo $(DEPDIR)/libsynfig_la-valuenode_and.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_and.cpp' object='libsynfig_la-valuenode_and.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_and.lo `test -f 'valuenode_and.cpp' || echo '$(srcdir)/'`valuenode_and.cpp
-
-libsynfig_la-valuenode_anglestring.lo: valuenode_anglestring.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_anglestring.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_anglestring.Tpo -c -o libsynfig_la-valuenode_anglestring.lo `test -f 'valuenode_anglestring.cpp' || echo '$(srcdir)/'`valuenode_anglestring.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_anglestring.Tpo $(DEPDIR)/libsynfig_la-valuenode_anglestring.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_anglestring.cpp' object='libsynfig_la-valuenode_anglestring.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_anglestring.lo `test -f 'valuenode_anglestring.cpp' || echo '$(srcdir)/'`valuenode_anglestring.cpp
-
-libsynfig_la-valuenode_animated.lo: valuenode_animated.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_animated.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_animated.Tpo -c -o libsynfig_la-valuenode_animated.lo `test -f 'valuenode_animated.cpp' || echo '$(srcdir)/'`valuenode_animated.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_animated.Tpo $(DEPDIR)/libsynfig_la-valuenode_animated.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_animated.cpp' object='libsynfig_la-valuenode_animated.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_animated.lo `test -f 'valuenode_animated.cpp' || echo '$(srcdir)/'`valuenode_animated.cpp
-
-libsynfig_la-valuenode_atan2.lo: valuenode_atan2.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_atan2.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_atan2.Tpo -c -o libsynfig_la-valuenode_atan2.lo `test -f 'valuenode_atan2.cpp' || echo '$(srcdir)/'`valuenode_atan2.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_atan2.Tpo $(DEPDIR)/libsynfig_la-valuenode_atan2.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_atan2.cpp' object='libsynfig_la-valuenode_atan2.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_atan2.lo `test -f 'valuenode_atan2.cpp' || echo '$(srcdir)/'`valuenode_atan2.cpp
-
-libsynfig_la-valuenode_bline.lo: valuenode_bline.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_bline.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_bline.Tpo -c -o libsynfig_la-valuenode_bline.lo `test -f 'valuenode_bline.cpp' || echo '$(srcdir)/'`valuenode_bline.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_bline.Tpo $(DEPDIR)/libsynfig_la-valuenode_bline.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_bline.cpp' object='libsynfig_la-valuenode_bline.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_bline.lo `test -f 'valuenode_bline.cpp' || echo '$(srcdir)/'`valuenode_bline.cpp
-
-libsynfig_la-valuenode_blinecalctangent.lo: valuenode_blinecalctangent.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_blinecalctangent.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_blinecalctangent.Tpo -c -o libsynfig_la-valuenode_blinecalctangent.lo `test -f 'valuenode_blinecalctangent.cpp' || echo '$(srcdir)/'`valuenode_blinecalctangent.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_blinecalctangent.Tpo $(DEPDIR)/libsynfig_la-valuenode_blinecalctangent.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_blinecalctangent.cpp' object='libsynfig_la-valuenode_blinecalctangent.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_blinecalctangent.lo `test -f 'valuenode_blinecalctangent.cpp' || echo '$(srcdir)/'`valuenode_blinecalctangent.cpp
-
-libsynfig_la-valuenode_blinecalcvertex.lo: valuenode_blinecalcvertex.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_blinecalcvertex.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_blinecalcvertex.Tpo -c -o libsynfig_la-valuenode_blinecalcvertex.lo `test -f 'valuenode_blinecalcvertex.cpp' || echo '$(srcdir)/'`valuenode_blinecalcvertex.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_blinecalcvertex.Tpo $(DEPDIR)/libsynfig_la-valuenode_blinecalcvertex.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_blinecalcvertex.cpp' object='libsynfig_la-valuenode_blinecalcvertex.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_blinecalcvertex.lo `test -f 'valuenode_blinecalcvertex.cpp' || echo '$(srcdir)/'`valuenode_blinecalcvertex.cpp
-
-libsynfig_la-valuenode_blinecalcwidth.lo: valuenode_blinecalcwidth.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_blinecalcwidth.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_blinecalcwidth.Tpo -c -o libsynfig_la-valuenode_blinecalcwidth.lo `test -f 'valuenode_blinecalcwidth.cpp' || echo '$(srcdir)/'`valuenode_blinecalcwidth.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_blinecalcwidth.Tpo $(DEPDIR)/libsynfig_la-valuenode_blinecalcwidth.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_blinecalcwidth.cpp' object='libsynfig_la-valuenode_blinecalcwidth.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_blinecalcwidth.lo `test -f 'valuenode_blinecalcwidth.cpp' || echo '$(srcdir)/'`valuenode_blinecalcwidth.cpp
-
-libsynfig_la-valuenode_blinereversetangent.lo: valuenode_blinereversetangent.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_blinereversetangent.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_blinereversetangent.Tpo -c -o libsynfig_la-valuenode_blinereversetangent.lo `test -f 'valuenode_blinereversetangent.cpp' || echo '$(srcdir)/'`valuenode_blinereversetangent.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_blinereversetangent.Tpo $(DEPDIR)/libsynfig_la-valuenode_blinereversetangent.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_blinereversetangent.cpp' object='libsynfig_la-valuenode_blinereversetangent.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_blinereversetangent.lo `test -f 'valuenode_blinereversetangent.cpp' || echo '$(srcdir)/'`valuenode_blinereversetangent.cpp
-
-libsynfig_la-valuenode_compare.lo: valuenode_compare.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_compare.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_compare.Tpo -c -o libsynfig_la-valuenode_compare.lo `test -f 'valuenode_compare.cpp' || echo '$(srcdir)/'`valuenode_compare.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_compare.Tpo $(DEPDIR)/libsynfig_la-valuenode_compare.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_compare.cpp' object='libsynfig_la-valuenode_compare.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_compare.lo `test -f 'valuenode_compare.cpp' || echo '$(srcdir)/'`valuenode_compare.cpp
-
-libsynfig_la-valuenode_composite.lo: valuenode_composite.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_composite.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_composite.Tpo -c -o libsynfig_la-valuenode_composite.lo `test -f 'valuenode_composite.cpp' || echo '$(srcdir)/'`valuenode_composite.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_composite.Tpo $(DEPDIR)/libsynfig_la-valuenode_composite.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_composite.cpp' object='libsynfig_la-valuenode_composite.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_composite.lo `test -f 'valuenode_composite.cpp' || echo '$(srcdir)/'`valuenode_composite.cpp
-
-libsynfig_la-valuenode_const.lo: valuenode_const.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_const.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_const.Tpo -c -o libsynfig_la-valuenode_const.lo `test -f 'valuenode_const.cpp' || echo '$(srcdir)/'`valuenode_const.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_const.Tpo $(DEPDIR)/libsynfig_la-valuenode_const.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_const.cpp' object='libsynfig_la-valuenode_const.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_const.lo `test -f 'valuenode_const.cpp' || echo '$(srcdir)/'`valuenode_const.cpp
-
-libsynfig_la-valuenode_cos.lo: valuenode_cos.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_cos.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_cos.Tpo -c -o libsynfig_la-valuenode_cos.lo `test -f 'valuenode_cos.cpp' || echo '$(srcdir)/'`valuenode_cos.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_cos.Tpo $(DEPDIR)/libsynfig_la-valuenode_cos.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_cos.cpp' object='libsynfig_la-valuenode_cos.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_cos.lo `test -f 'valuenode_cos.cpp' || echo '$(srcdir)/'`valuenode_cos.cpp
-
-libsynfig_la-valuenode_dilist.lo: valuenode_dilist.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_dilist.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_dilist.Tpo -c -o libsynfig_la-valuenode_dilist.lo `test -f 'valuenode_dilist.cpp' || echo '$(srcdir)/'`valuenode_dilist.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_dilist.Tpo $(DEPDIR)/libsynfig_la-valuenode_dilist.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_dilist.cpp' object='libsynfig_la-valuenode_dilist.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_dilist.lo `test -f 'valuenode_dilist.cpp' || echo '$(srcdir)/'`valuenode_dilist.cpp
-
-libsynfig_la-valuenode_dotproduct.lo: valuenode_dotproduct.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_dotproduct.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_dotproduct.Tpo -c -o libsynfig_la-valuenode_dotproduct.lo `test -f 'valuenode_dotproduct.cpp' || echo '$(srcdir)/'`valuenode_dotproduct.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_dotproduct.Tpo $(DEPDIR)/libsynfig_la-valuenode_dotproduct.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_dotproduct.cpp' object='libsynfig_la-valuenode_dotproduct.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_dotproduct.lo `test -f 'valuenode_dotproduct.cpp' || echo '$(srcdir)/'`valuenode_dotproduct.cpp
-
-libsynfig_la-valuenode_duplicate.lo: valuenode_duplicate.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_duplicate.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_duplicate.Tpo -c -o libsynfig_la-valuenode_duplicate.lo `test -f 'valuenode_duplicate.cpp' || echo '$(srcdir)/'`valuenode_duplicate.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_duplicate.Tpo $(DEPDIR)/libsynfig_la-valuenode_duplicate.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_duplicate.cpp' object='libsynfig_la-valuenode_duplicate.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_duplicate.lo `test -f 'valuenode_duplicate.cpp' || echo '$(srcdir)/'`valuenode_duplicate.cpp
-
-libsynfig_la-valuenode_dynamiclist.lo: valuenode_dynamiclist.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_dynamiclist.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_dynamiclist.Tpo -c -o libsynfig_la-valuenode_dynamiclist.lo `test -f 'valuenode_dynamiclist.cpp' || echo '$(srcdir)/'`valuenode_dynamiclist.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_dynamiclist.Tpo $(DEPDIR)/libsynfig_la-valuenode_dynamiclist.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_dynamiclist.cpp' object='libsynfig_la-valuenode_dynamiclist.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_dynamiclist.lo `test -f 'valuenode_dynamiclist.cpp' || echo '$(srcdir)/'`valuenode_dynamiclist.cpp
-
-libsynfig_la-valuenode_exp.lo: valuenode_exp.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_exp.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_exp.Tpo -c -o libsynfig_la-valuenode_exp.lo `test -f 'valuenode_exp.cpp' || echo '$(srcdir)/'`valuenode_exp.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_exp.Tpo $(DEPDIR)/libsynfig_la-valuenode_exp.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_exp.cpp' object='libsynfig_la-valuenode_exp.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_exp.lo `test -f 'valuenode_exp.cpp' || echo '$(srcdir)/'`valuenode_exp.cpp
-
-libsynfig_la-valuenode_gradientcolor.lo: valuenode_gradientcolor.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_gradientcolor.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_gradientcolor.Tpo -c -o libsynfig_la-valuenode_gradientcolor.lo `test -f 'valuenode_gradientcolor.cpp' || echo '$(srcdir)/'`valuenode_gradientcolor.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_gradientcolor.Tpo $(DEPDIR)/libsynfig_la-valuenode_gradientcolor.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_gradientcolor.cpp' object='libsynfig_la-valuenode_gradientcolor.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_gradientcolor.lo `test -f 'valuenode_gradientcolor.cpp' || echo '$(srcdir)/'`valuenode_gradientcolor.cpp
-
-libsynfig_la-valuenode_gradientrotate.lo: valuenode_gradientrotate.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_gradientrotate.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_gradientrotate.Tpo -c -o libsynfig_la-valuenode_gradientrotate.lo `test -f 'valuenode_gradientrotate.cpp' || echo '$(srcdir)/'`valuenode_gradientrotate.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_gradientrotate.Tpo $(DEPDIR)/libsynfig_la-valuenode_gradientrotate.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_gradientrotate.cpp' object='libsynfig_la-valuenode_gradientrotate.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_gradientrotate.lo `test -f 'valuenode_gradientrotate.cpp' || echo '$(srcdir)/'`valuenode_gradientrotate.cpp
-
-libsynfig_la-valuenode_greyed.lo: valuenode_greyed.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_greyed.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_greyed.Tpo -c -o libsynfig_la-valuenode_greyed.lo `test -f 'valuenode_greyed.cpp' || echo '$(srcdir)/'`valuenode_greyed.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_greyed.Tpo $(DEPDIR)/libsynfig_la-valuenode_greyed.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_greyed.cpp' object='libsynfig_la-valuenode_greyed.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_greyed.lo `test -f 'valuenode_greyed.cpp' || echo '$(srcdir)/'`valuenode_greyed.cpp
-
-libsynfig_la-valuenode_integer.lo: valuenode_integer.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_integer.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_integer.Tpo -c -o libsynfig_la-valuenode_integer.lo `test -f 'valuenode_integer.cpp' || echo '$(srcdir)/'`valuenode_integer.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_integer.Tpo $(DEPDIR)/libsynfig_la-valuenode_integer.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_integer.cpp' object='libsynfig_la-valuenode_integer.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_integer.lo `test -f 'valuenode_integer.cpp' || echo '$(srcdir)/'`valuenode_integer.cpp
-
-libsynfig_la-valuenode_intstring.lo: valuenode_intstring.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_intstring.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_intstring.Tpo -c -o libsynfig_la-valuenode_intstring.lo `test -f 'valuenode_intstring.cpp' || echo '$(srcdir)/'`valuenode_intstring.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_intstring.Tpo $(DEPDIR)/libsynfig_la-valuenode_intstring.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_intstring.cpp' object='libsynfig_la-valuenode_intstring.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_intstring.lo `test -f 'valuenode_intstring.cpp' || echo '$(srcdir)/'`valuenode_intstring.cpp
-
-libsynfig_la-valuenode_join.lo: valuenode_join.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_join.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_join.Tpo -c -o libsynfig_la-valuenode_join.lo `test -f 'valuenode_join.cpp' || echo '$(srcdir)/'`valuenode_join.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_join.Tpo $(DEPDIR)/libsynfig_la-valuenode_join.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_join.cpp' object='libsynfig_la-valuenode_join.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_join.lo `test -f 'valuenode_join.cpp' || echo '$(srcdir)/'`valuenode_join.cpp
-
-libsynfig_la-valuenode_linear.lo: valuenode_linear.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_linear.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_linear.Tpo -c -o libsynfig_la-valuenode_linear.lo `test -f 'valuenode_linear.cpp' || echo '$(srcdir)/'`valuenode_linear.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_linear.Tpo $(DEPDIR)/libsynfig_la-valuenode_linear.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_linear.cpp' object='libsynfig_la-valuenode_linear.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_linear.lo `test -f 'valuenode_linear.cpp' || echo '$(srcdir)/'`valuenode_linear.cpp
-
-libsynfig_la-valuenode_log.lo: valuenode_log.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_log.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_log.Tpo -c -o libsynfig_la-valuenode_log.lo `test -f 'valuenode_log.cpp' || echo '$(srcdir)/'`valuenode_log.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_log.Tpo $(DEPDIR)/libsynfig_la-valuenode_log.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_log.cpp' object='libsynfig_la-valuenode_log.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_log.lo `test -f 'valuenode_log.cpp' || echo '$(srcdir)/'`valuenode_log.cpp
-
-libsynfig_la-valuenode_not.lo: valuenode_not.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_not.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_not.Tpo -c -o libsynfig_la-valuenode_not.lo `test -f 'valuenode_not.cpp' || echo '$(srcdir)/'`valuenode_not.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_not.Tpo $(DEPDIR)/libsynfig_la-valuenode_not.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_not.cpp' object='libsynfig_la-valuenode_not.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_not.lo `test -f 'valuenode_not.cpp' || echo '$(srcdir)/'`valuenode_not.cpp
-
-libsynfig_la-valuenode_or.lo: valuenode_or.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_or.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_or.Tpo -c -o libsynfig_la-valuenode_or.lo `test -f 'valuenode_or.cpp' || echo '$(srcdir)/'`valuenode_or.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_or.Tpo $(DEPDIR)/libsynfig_la-valuenode_or.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_or.cpp' object='libsynfig_la-valuenode_or.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_or.lo `test -f 'valuenode_or.cpp' || echo '$(srcdir)/'`valuenode_or.cpp
-
-libsynfig_la-valuenode_pow.lo: valuenode_pow.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_pow.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_pow.Tpo -c -o libsynfig_la-valuenode_pow.lo `test -f 'valuenode_pow.cpp' || echo '$(srcdir)/'`valuenode_pow.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_pow.Tpo $(DEPDIR)/libsynfig_la-valuenode_pow.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_pow.cpp' object='libsynfig_la-valuenode_pow.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_pow.lo `test -f 'valuenode_pow.cpp' || echo '$(srcdir)/'`valuenode_pow.cpp
-
-libsynfig_la-valuenode_radialcomposite.lo: valuenode_radialcomposite.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_radialcomposite.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_radialcomposite.Tpo -c -o libsynfig_la-valuenode_radialcomposite.lo `test -f 'valuenode_radialcomposite.cpp' || echo '$(srcdir)/'`valuenode_radialcomposite.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_radialcomposite.Tpo $(DEPDIR)/libsynfig_la-valuenode_radialcomposite.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_radialcomposite.cpp' object='libsynfig_la-valuenode_radialcomposite.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_radialcomposite.lo `test -f 'valuenode_radialcomposite.cpp' || echo '$(srcdir)/'`valuenode_radialcomposite.cpp
-
-libsynfig_la-valuenode_range.lo: valuenode_range.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_range.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_range.Tpo -c -o libsynfig_la-valuenode_range.lo `test -f 'valuenode_range.cpp' || echo '$(srcdir)/'`valuenode_range.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_range.Tpo $(DEPDIR)/libsynfig_la-valuenode_range.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_range.cpp' object='libsynfig_la-valuenode_range.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_range.lo `test -f 'valuenode_range.cpp' || echo '$(srcdir)/'`valuenode_range.cpp
-
-libsynfig_la-valuenode_real.lo: valuenode_real.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_real.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_real.Tpo -c -o libsynfig_la-valuenode_real.lo `test -f 'valuenode_real.cpp' || echo '$(srcdir)/'`valuenode_real.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_real.Tpo $(DEPDIR)/libsynfig_la-valuenode_real.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_real.cpp' object='libsynfig_la-valuenode_real.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_real.lo `test -f 'valuenode_real.cpp' || echo '$(srcdir)/'`valuenode_real.cpp
-
-libsynfig_la-valuenode_realstring.lo: valuenode_realstring.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_realstring.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_realstring.Tpo -c -o libsynfig_la-valuenode_realstring.lo `test -f 'valuenode_realstring.cpp' || echo '$(srcdir)/'`valuenode_realstring.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_realstring.Tpo $(DEPDIR)/libsynfig_la-valuenode_realstring.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_realstring.cpp' object='libsynfig_la-valuenode_realstring.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_realstring.lo `test -f 'valuenode_realstring.cpp' || echo '$(srcdir)/'`valuenode_realstring.cpp
-
-libsynfig_la-valuenode_reciprocal.lo: valuenode_reciprocal.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_reciprocal.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_reciprocal.Tpo -c -o libsynfig_la-valuenode_reciprocal.lo `test -f 'valuenode_reciprocal.cpp' || echo '$(srcdir)/'`valuenode_reciprocal.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_reciprocal.Tpo $(DEPDIR)/libsynfig_la-valuenode_reciprocal.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_reciprocal.cpp' object='libsynfig_la-valuenode_reciprocal.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_reciprocal.lo `test -f 'valuenode_reciprocal.cpp' || echo '$(srcdir)/'`valuenode_reciprocal.cpp
-
-libsynfig_la-valuenode_reference.lo: valuenode_reference.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_reference.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_reference.Tpo -c -o libsynfig_la-valuenode_reference.lo `test -f 'valuenode_reference.cpp' || echo '$(srcdir)/'`valuenode_reference.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_reference.Tpo $(DEPDIR)/libsynfig_la-valuenode_reference.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_reference.cpp' object='libsynfig_la-valuenode_reference.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_reference.lo `test -f 'valuenode_reference.cpp' || echo '$(srcdir)/'`valuenode_reference.cpp
-
-libsynfig_la-valuenode_repeat_gradient.lo: valuenode_repeat_gradient.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_repeat_gradient.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_repeat_gradient.Tpo -c -o libsynfig_la-valuenode_repeat_gradient.lo `test -f 'valuenode_repeat_gradient.cpp' || echo '$(srcdir)/'`valuenode_repeat_gradient.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_repeat_gradient.Tpo $(DEPDIR)/libsynfig_la-valuenode_repeat_gradient.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_repeat_gradient.cpp' object='libsynfig_la-valuenode_repeat_gradient.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_repeat_gradient.lo `test -f 'valuenode_repeat_gradient.cpp' || echo '$(srcdir)/'`valuenode_repeat_gradient.cpp
-
-libsynfig_la-valuenode_scale.lo: valuenode_scale.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_scale.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_scale.Tpo -c -o libsynfig_la-valuenode_scale.lo `test -f 'valuenode_scale.cpp' || echo '$(srcdir)/'`valuenode_scale.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_scale.Tpo $(DEPDIR)/libsynfig_la-valuenode_scale.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_scale.cpp' object='libsynfig_la-valuenode_scale.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_scale.lo `test -f 'valuenode_scale.cpp' || echo '$(srcdir)/'`valuenode_scale.cpp
-
-libsynfig_la-valuenode_segcalctangent.lo: valuenode_segcalctangent.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_segcalctangent.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_segcalctangent.Tpo -c -o libsynfig_la-valuenode_segcalctangent.lo `test -f 'valuenode_segcalctangent.cpp' || echo '$(srcdir)/'`valuenode_segcalctangent.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_segcalctangent.Tpo $(DEPDIR)/libsynfig_la-valuenode_segcalctangent.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_segcalctangent.cpp' object='libsynfig_la-valuenode_segcalctangent.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_segcalctangent.lo `test -f 'valuenode_segcalctangent.cpp' || echo '$(srcdir)/'`valuenode_segcalctangent.cpp
-
-libsynfig_la-valuenode_segcalcvertex.lo: valuenode_segcalcvertex.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_segcalcvertex.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_segcalcvertex.Tpo -c -o libsynfig_la-valuenode_segcalcvertex.lo `test -f 'valuenode_segcalcvertex.cpp' || echo '$(srcdir)/'`valuenode_segcalcvertex.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_segcalcvertex.Tpo $(DEPDIR)/libsynfig_la-valuenode_segcalcvertex.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_segcalcvertex.cpp' object='libsynfig_la-valuenode_segcalcvertex.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_segcalcvertex.lo `test -f 'valuenode_segcalcvertex.cpp' || echo '$(srcdir)/'`valuenode_segcalcvertex.cpp
-
-libsynfig_la-valuenode_sine.lo: valuenode_sine.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_sine.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_sine.Tpo -c -o libsynfig_la-valuenode_sine.lo `test -f 'valuenode_sine.cpp' || echo '$(srcdir)/'`valuenode_sine.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_sine.Tpo $(DEPDIR)/libsynfig_la-valuenode_sine.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_sine.cpp' object='libsynfig_la-valuenode_sine.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_sine.lo `test -f 'valuenode_sine.cpp' || echo '$(srcdir)/'`valuenode_sine.cpp
-
-libsynfig_la-valuenode_step.lo: valuenode_step.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_step.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_step.Tpo -c -o libsynfig_la-valuenode_step.lo `test -f 'valuenode_step.cpp' || echo '$(srcdir)/'`valuenode_step.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_step.Tpo $(DEPDIR)/libsynfig_la-valuenode_step.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_step.cpp' object='libsynfig_la-valuenode_step.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_step.lo `test -f 'valuenode_step.cpp' || echo '$(srcdir)/'`valuenode_step.cpp
-
-libsynfig_la-valuenode_stripes.lo: valuenode_stripes.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_stripes.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_stripes.Tpo -c -o libsynfig_la-valuenode_stripes.lo `test -f 'valuenode_stripes.cpp' || echo '$(srcdir)/'`valuenode_stripes.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_stripes.Tpo $(DEPDIR)/libsynfig_la-valuenode_stripes.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_stripes.cpp' object='libsynfig_la-valuenode_stripes.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_stripes.lo `test -f 'valuenode_stripes.cpp' || echo '$(srcdir)/'`valuenode_stripes.cpp
-
-libsynfig_la-valuenode_subtract.lo: valuenode_subtract.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_subtract.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_subtract.Tpo -c -o libsynfig_la-valuenode_subtract.lo `test -f 'valuenode_subtract.cpp' || echo '$(srcdir)/'`valuenode_subtract.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_subtract.Tpo $(DEPDIR)/libsynfig_la-valuenode_subtract.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_subtract.cpp' object='libsynfig_la-valuenode_subtract.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_subtract.lo `test -f 'valuenode_subtract.cpp' || echo '$(srcdir)/'`valuenode_subtract.cpp
-
-libsynfig_la-valuenode_switch.lo: valuenode_switch.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_switch.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_switch.Tpo -c -o libsynfig_la-valuenode_switch.lo `test -f 'valuenode_switch.cpp' || echo '$(srcdir)/'`valuenode_switch.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_switch.Tpo $(DEPDIR)/libsynfig_la-valuenode_switch.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_switch.cpp' object='libsynfig_la-valuenode_switch.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_switch.lo `test -f 'valuenode_switch.cpp' || echo '$(srcdir)/'`valuenode_switch.cpp
-
-libsynfig_la-valuenode_timedswap.lo: valuenode_timedswap.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_timedswap.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_timedswap.Tpo -c -o libsynfig_la-valuenode_timedswap.lo `test -f 'valuenode_timedswap.cpp' || echo '$(srcdir)/'`valuenode_timedswap.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_timedswap.Tpo $(DEPDIR)/libsynfig_la-valuenode_timedswap.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_timedswap.cpp' object='libsynfig_la-valuenode_timedswap.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_timedswap.lo `test -f 'valuenode_timedswap.cpp' || echo '$(srcdir)/'`valuenode_timedswap.cpp
-
-libsynfig_la-valuenode_timeloop.lo: valuenode_timeloop.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_timeloop.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_timeloop.Tpo -c -o libsynfig_la-valuenode_timeloop.lo `test -f 'valuenode_timeloop.cpp' || echo '$(srcdir)/'`valuenode_timeloop.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_timeloop.Tpo $(DEPDIR)/libsynfig_la-valuenode_timeloop.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_timeloop.cpp' object='libsynfig_la-valuenode_timeloop.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_timeloop.lo `test -f 'valuenode_timeloop.cpp' || echo '$(srcdir)/'`valuenode_timeloop.cpp
-
-libsynfig_la-valuenode_timestring.lo: valuenode_timestring.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_timestring.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_timestring.Tpo -c -o libsynfig_la-valuenode_timestring.lo `test -f 'valuenode_timestring.cpp' || echo '$(srcdir)/'`valuenode_timestring.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_timestring.Tpo $(DEPDIR)/libsynfig_la-valuenode_timestring.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_timestring.cpp' object='libsynfig_la-valuenode_timestring.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_timestring.lo `test -f 'valuenode_timestring.cpp' || echo '$(srcdir)/'`valuenode_timestring.cpp
-
-libsynfig_la-valuenode_twotone.lo: valuenode_twotone.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_twotone.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_twotone.Tpo -c -o libsynfig_la-valuenode_twotone.lo `test -f 'valuenode_twotone.cpp' || echo '$(srcdir)/'`valuenode_twotone.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_twotone.Tpo $(DEPDIR)/libsynfig_la-valuenode_twotone.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_twotone.cpp' object='libsynfig_la-valuenode_twotone.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_twotone.lo `test -f 'valuenode_twotone.cpp' || echo '$(srcdir)/'`valuenode_twotone.cpp
-
-libsynfig_la-valuenode_vectorangle.lo: valuenode_vectorangle.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_vectorangle.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_vectorangle.Tpo -c -o libsynfig_la-valuenode_vectorangle.lo `test -f 'valuenode_vectorangle.cpp' || echo '$(srcdir)/'`valuenode_vectorangle.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_vectorangle.Tpo $(DEPDIR)/libsynfig_la-valuenode_vectorangle.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_vectorangle.cpp' object='libsynfig_la-valuenode_vectorangle.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_vectorangle.lo `test -f 'valuenode_vectorangle.cpp' || echo '$(srcdir)/'`valuenode_vectorangle.cpp
-
-libsynfig_la-valuenode_vectorlength.lo: valuenode_vectorlength.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_vectorlength.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_vectorlength.Tpo -c -o libsynfig_la-valuenode_vectorlength.lo `test -f 'valuenode_vectorlength.cpp' || echo '$(srcdir)/'`valuenode_vectorlength.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_vectorlength.Tpo $(DEPDIR)/libsynfig_la-valuenode_vectorlength.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_vectorlength.cpp' object='libsynfig_la-valuenode_vectorlength.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_vectorlength.lo `test -f 'valuenode_vectorlength.cpp' || echo '$(srcdir)/'`valuenode_vectorlength.cpp
-
-libsynfig_la-valuenode_vectorx.lo: valuenode_vectorx.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_vectorx.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_vectorx.Tpo -c -o libsynfig_la-valuenode_vectorx.lo `test -f 'valuenode_vectorx.cpp' || echo '$(srcdir)/'`valuenode_vectorx.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_vectorx.Tpo $(DEPDIR)/libsynfig_la-valuenode_vectorx.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_vectorx.cpp' object='libsynfig_la-valuenode_vectorx.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_vectorx.lo `test -f 'valuenode_vectorx.cpp' || echo '$(srcdir)/'`valuenode_vectorx.cpp
-
-libsynfig_la-valuenode_vectory.lo: valuenode_vectory.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_vectory.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_vectory.Tpo -c -o libsynfig_la-valuenode_vectory.lo `test -f 'valuenode_vectory.cpp' || echo '$(srcdir)/'`valuenode_vectory.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_vectory.Tpo $(DEPDIR)/libsynfig_la-valuenode_vectory.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_vectory.cpp' object='libsynfig_la-valuenode_vectory.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_vectory.lo `test -f 'valuenode_vectory.cpp' || echo '$(srcdir)/'`valuenode_vectory.cpp
-
-libsynfig_la-valuenode_boneinfluence.lo: valuenode_boneinfluence.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_boneinfluence.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_boneinfluence.Tpo -c -o libsynfig_la-valuenode_boneinfluence.lo `test -f 'valuenode_boneinfluence.cpp' || echo '$(srcdir)/'`valuenode_boneinfluence.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_boneinfluence.Tpo $(DEPDIR)/libsynfig_la-valuenode_boneinfluence.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_boneinfluence.cpp' object='libsynfig_la-valuenode_boneinfluence.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_boneinfluence.lo `test -f 'valuenode_boneinfluence.cpp' || echo '$(srcdir)/'`valuenode_boneinfluence.cpp
-
-libsynfig_la-valuenode_staticlist.lo: valuenode_staticlist.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_staticlist.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_staticlist.Tpo -c -o libsynfig_la-valuenode_staticlist.lo `test -f 'valuenode_staticlist.cpp' || echo '$(srcdir)/'`valuenode_staticlist.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_staticlist.Tpo $(DEPDIR)/libsynfig_la-valuenode_staticlist.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_staticlist.cpp' object='libsynfig_la-valuenode_staticlist.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_staticlist.lo `test -f 'valuenode_staticlist.cpp' || echo '$(srcdir)/'`valuenode_staticlist.cpp
-
-libsynfig_la-valuenode_bone.lo: valuenode_bone.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_bone.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_bone.Tpo -c -o libsynfig_la-valuenode_bone.lo `test -f 'valuenode_bone.cpp' || echo '$(srcdir)/'`valuenode_bone.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_bone.Tpo $(DEPDIR)/libsynfig_la-valuenode_bone.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_bone.cpp' object='libsynfig_la-valuenode_bone.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_bone.lo `test -f 'valuenode_bone.cpp' || echo '$(srcdir)/'`valuenode_bone.cpp
-
-libsynfig_la-valuenode_boneweightpair.lo: valuenode_boneweightpair.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_boneweightpair.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_boneweightpair.Tpo -c -o libsynfig_la-valuenode_boneweightpair.lo `test -f 'valuenode_boneweightpair.cpp' || echo '$(srcdir)/'`valuenode_boneweightpair.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_boneweightpair.Tpo $(DEPDIR)/libsynfig_la-valuenode_boneweightpair.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_boneweightpair.cpp' object='libsynfig_la-valuenode_boneweightpair.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_boneweightpair.lo `test -f 'valuenode_boneweightpair.cpp' || echo '$(srcdir)/'`valuenode_boneweightpair.cpp
-
-libsynfig_la-valuenode_wplist.lo: valuenode_wplist.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_wplist.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_wplist.Tpo -c -o libsynfig_la-valuenode_wplist.lo `test -f 'valuenode_wplist.cpp' || echo '$(srcdir)/'`valuenode_wplist.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_wplist.Tpo $(DEPDIR)/libsynfig_la-valuenode_wplist.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_wplist.cpp' object='libsynfig_la-valuenode_wplist.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_wplist.lo `test -f 'valuenode_wplist.cpp' || echo '$(srcdir)/'`valuenode_wplist.cpp
-
-libsynfig_la-valuenode_bonelink.lo: valuenode_bonelink.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_bonelink.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_bonelink.Tpo -c -o libsynfig_la-valuenode_bonelink.lo `test -f 'valuenode_bonelink.cpp' || echo '$(srcdir)/'`valuenode_bonelink.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_bonelink.Tpo $(DEPDIR)/libsynfig_la-valuenode_bonelink.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_bonelink.cpp' object='libsynfig_la-valuenode_bonelink.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_bonelink.lo `test -f 'valuenode_bonelink.cpp' || echo '$(srcdir)/'`valuenode_bonelink.cpp
-
-libsynfig_la-valuenode_average.lo: valuenode_average.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_average.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_average.Tpo -c -o libsynfig_la-valuenode_average.lo `test -f 'valuenode_average.cpp' || echo '$(srcdir)/'`valuenode_average.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_average.Tpo $(DEPDIR)/libsynfig_la-valuenode_average.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_average.cpp' object='libsynfig_la-valuenode_average.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_average.lo `test -f 'valuenode_average.cpp' || echo '$(srcdir)/'`valuenode_average.cpp
-
-libsynfig_la-valuenode_dynamic.lo: valuenode_dynamic.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_dynamic.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_dynamic.Tpo -c -o libsynfig_la-valuenode_dynamic.lo `test -f 'valuenode_dynamic.cpp' || echo '$(srcdir)/'`valuenode_dynamic.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_dynamic.Tpo $(DEPDIR)/libsynfig_la-valuenode_dynamic.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_dynamic.cpp' object='libsynfig_la-valuenode_dynamic.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_dynamic.lo `test -f 'valuenode_dynamic.cpp' || echo '$(srcdir)/'`valuenode_dynamic.cpp
-
-libsynfig_la-valuenode_derivative.lo: valuenode_derivative.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_derivative.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_derivative.Tpo -c -o libsynfig_la-valuenode_derivative.lo `test -f 'valuenode_derivative.cpp' || echo '$(srcdir)/'`valuenode_derivative.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_derivative.Tpo $(DEPDIR)/libsynfig_la-valuenode_derivative.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_derivative.cpp' object='libsynfig_la-valuenode_derivative.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_derivative.lo `test -f 'valuenode_derivative.cpp' || echo '$(srcdir)/'`valuenode_derivative.cpp
-
-libsynfig_la-valuenode_weightedaverage.lo: valuenode_weightedaverage.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-valuenode_weightedaverage.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-valuenode_weightedaverage.Tpo -c -o libsynfig_la-valuenode_weightedaverage.lo `test -f 'valuenode_weightedaverage.cpp' || echo '$(srcdir)/'`valuenode_weightedaverage.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-valuenode_weightedaverage.Tpo $(DEPDIR)/libsynfig_la-valuenode_weightedaverage.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenode_weightedaverage.cpp' object='libsynfig_la-valuenode_weightedaverage.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-valuenode_weightedaverage.lo `test -f 'valuenode_weightedaverage.cpp' || echo '$(srcdir)/'`valuenode_weightedaverage.cpp
-
 libsynfig_la-activepoint.lo: activepoint.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-activepoint.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-activepoint.Tpo -c -o libsynfig_la-activepoint.lo `test -f 'activepoint.cpp' || echo '$(srcdir)/'`activepoint.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-activepoint.Tpo $(DEPDIR)/libsynfig_la-activepoint.Plo
@@ -1867,13 +1598,6 @@ libsynfig_la-canvas.lo: canvas.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-canvas.lo `test -f 'canvas.cpp' || echo '$(srcdir)/'`canvas.cpp
 
-libsynfig_la-color.lo: color.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-color.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-color.Tpo -c -o libsynfig_la-color.lo `test -f 'color.cpp' || echo '$(srcdir)/'`color.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-color.Tpo $(DEPDIR)/libsynfig_la-color.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='color.cpp' object='libsynfig_la-color.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-color.lo `test -f 'color.cpp' || echo '$(srcdir)/'`color.cpp
-
 libsynfig_la-context.lo: context.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT libsynfig_la-context.lo -MD -MP -MF $(DEPDIR)/libsynfig_la-context.Tpo -c -o libsynfig_la-context.lo `test -f 'context.cpp' || echo '$(srcdir)/'`context.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsynfig_la-context.Tpo $(DEPDIR)/libsynfig_la-context.Plo
@@ -2196,31 +1920,604 @@ libsynfig_la-cairolistimporter.lo: cairolistimporter.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o libsynfig_la-cairolistimporter.lo `test -f 'cairolistimporter.cpp' || echo '$(srcdir)/'`cairolistimporter.cpp
 
+color/libsynfig_la-color.lo: color/color.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT color/libsynfig_la-color.lo -MD -MP -MF color/$(DEPDIR)/libsynfig_la-color.Tpo -c -o color/libsynfig_la-color.lo `test -f 'color/color.cpp' || echo '$(srcdir)/'`color/color.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) color/$(DEPDIR)/libsynfig_la-color.Tpo color/$(DEPDIR)/libsynfig_la-color.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='color/color.cpp' object='color/libsynfig_la-color.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o color/libsynfig_la-color.lo `test -f 'color/color.cpp' || echo '$(srcdir)/'`color/color.cpp
+
+color/libsynfig_la-cairocolor.lo: color/cairocolor.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT color/libsynfig_la-cairocolor.lo -MD -MP -MF color/$(DEPDIR)/libsynfig_la-cairocolor.Tpo -c -o color/libsynfig_la-cairocolor.lo `test -f 'color/cairocolor.cpp' || echo '$(srcdir)/'`color/cairocolor.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) color/$(DEPDIR)/libsynfig_la-cairocolor.Tpo color/$(DEPDIR)/libsynfig_la-cairocolor.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='color/cairocolor.cpp' object='color/libsynfig_la-cairocolor.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o color/libsynfig_la-cairocolor.lo `test -f 'color/cairocolor.cpp' || echo '$(srcdir)/'`color/cairocolor.cpp
+
+layers/libsynfig_la-layer_bitmap.lo: layers/layer_bitmap.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT layers/libsynfig_la-layer_bitmap.lo -MD -MP -MF layers/$(DEPDIR)/libsynfig_la-layer_bitmap.Tpo -c -o layers/libsynfig_la-layer_bitmap.lo `test -f 'layers/layer_bitmap.cpp' || echo '$(srcdir)/'`layers/layer_bitmap.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) layers/$(DEPDIR)/libsynfig_la-layer_bitmap.Tpo layers/$(DEPDIR)/libsynfig_la-layer_bitmap.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layers/layer_bitmap.cpp' object='layers/libsynfig_la-layer_bitmap.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o layers/libsynfig_la-layer_bitmap.lo `test -f 'layers/layer_bitmap.cpp' || echo '$(srcdir)/'`layers/layer_bitmap.cpp
+
+layers/libsynfig_la-layer_composite.lo: layers/layer_composite.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT layers/libsynfig_la-layer_composite.lo -MD -MP -MF layers/$(DEPDIR)/libsynfig_la-layer_composite.Tpo -c -o layers/libsynfig_la-layer_composite.lo `test -f 'layers/layer_composite.cpp' || echo '$(srcdir)/'`layers/layer_composite.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) layers/$(DEPDIR)/libsynfig_la-layer_composite.Tpo layers/$(DEPDIR)/libsynfig_la-layer_composite.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layers/layer_composite.cpp' object='layers/libsynfig_la-layer_composite.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o layers/libsynfig_la-layer_composite.lo `test -f 'layers/layer_composite.cpp' || echo '$(srcdir)/'`layers/layer_composite.cpp
+
+layers/libsynfig_la-layer_duplicate.lo: layers/layer_duplicate.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT layers/libsynfig_la-layer_duplicate.lo -MD -MP -MF layers/$(DEPDIR)/libsynfig_la-layer_duplicate.Tpo -c -o layers/libsynfig_la-layer_duplicate.lo `test -f 'layers/layer_duplicate.cpp' || echo '$(srcdir)/'`layers/layer_duplicate.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) layers/$(DEPDIR)/libsynfig_la-layer_duplicate.Tpo layers/$(DEPDIR)/libsynfig_la-layer_duplicate.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layers/layer_duplicate.cpp' object='layers/libsynfig_la-layer_duplicate.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o layers/libsynfig_la-layer_duplicate.lo `test -f 'layers/layer_duplicate.cpp' || echo '$(srcdir)/'`layers/layer_duplicate.cpp
+
+layers/libsynfig_la-layer_group.lo: layers/layer_group.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT layers/libsynfig_la-layer_group.lo -MD -MP -MF layers/$(DEPDIR)/libsynfig_la-layer_group.Tpo -c -o layers/libsynfig_la-layer_group.lo `test -f 'layers/layer_group.cpp' || echo '$(srcdir)/'`layers/layer_group.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) layers/$(DEPDIR)/libsynfig_la-layer_group.Tpo layers/$(DEPDIR)/libsynfig_la-layer_group.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layers/layer_group.cpp' object='layers/libsynfig_la-layer_group.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o layers/libsynfig_la-layer_group.lo `test -f 'layers/layer_group.cpp' || echo '$(srcdir)/'`layers/layer_group.cpp
+
+layers/libsynfig_la-layer_meshtransform.lo: layers/layer_meshtransform.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT layers/libsynfig_la-layer_meshtransform.lo -MD -MP -MF layers/$(DEPDIR)/libsynfig_la-layer_meshtransform.Tpo -c -o layers/libsynfig_la-layer_meshtransform.lo `test -f 'layers/layer_meshtransform.cpp' || echo '$(srcdir)/'`layers/layer_meshtransform.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) layers/$(DEPDIR)/libsynfig_la-layer_meshtransform.Tpo layers/$(DEPDIR)/libsynfig_la-layer_meshtransform.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layers/layer_meshtransform.cpp' object='layers/libsynfig_la-layer_meshtransform.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o layers/libsynfig_la-layer_meshtransform.lo `test -f 'layers/layer_meshtransform.cpp' || echo '$(srcdir)/'`layers/layer_meshtransform.cpp
+
+layers/libsynfig_la-layer_mime.lo: layers/layer_mime.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT layers/libsynfig_la-layer_mime.lo -MD -MP -MF layers/$(DEPDIR)/libsynfig_la-layer_mime.Tpo -c -o layers/libsynfig_la-layer_mime.lo `test -f 'layers/layer_mime.cpp' || echo '$(srcdir)/'`layers/layer_mime.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) layers/$(DEPDIR)/libsynfig_la-layer_mime.Tpo layers/$(DEPDIR)/libsynfig_la-layer_mime.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layers/layer_mime.cpp' object='layers/libsynfig_la-layer_mime.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o layers/libsynfig_la-layer_mime.lo `test -f 'layers/layer_mime.cpp' || echo '$(srcdir)/'`layers/layer_mime.cpp
+
+layers/libsynfig_la-layer_motionblur.lo: layers/layer_motionblur.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT layers/libsynfig_la-layer_motionblur.lo -MD -MP -MF layers/$(DEPDIR)/libsynfig_la-layer_motionblur.Tpo -c -o layers/libsynfig_la-layer_motionblur.lo `test -f 'layers/layer_motionblur.cpp' || echo '$(srcdir)/'`layers/layer_motionblur.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) layers/$(DEPDIR)/libsynfig_la-layer_motionblur.Tpo layers/$(DEPDIR)/libsynfig_la-layer_motionblur.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layers/layer_motionblur.cpp' object='layers/libsynfig_la-layer_motionblur.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o layers/libsynfig_la-layer_motionblur.lo `test -f 'layers/layer_motionblur.cpp' || echo '$(srcdir)/'`layers/layer_motionblur.cpp
+
+layers/libsynfig_la-layer_pastecanvas.lo: layers/layer_pastecanvas.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT layers/libsynfig_la-layer_pastecanvas.lo -MD -MP -MF layers/$(DEPDIR)/libsynfig_la-layer_pastecanvas.Tpo -c -o layers/libsynfig_la-layer_pastecanvas.lo `test -f 'layers/layer_pastecanvas.cpp' || echo '$(srcdir)/'`layers/layer_pastecanvas.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) layers/$(DEPDIR)/libsynfig_la-layer_pastecanvas.Tpo layers/$(DEPDIR)/libsynfig_la-layer_pastecanvas.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layers/layer_pastecanvas.cpp' object='layers/libsynfig_la-layer_pastecanvas.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o layers/libsynfig_la-layer_pastecanvas.lo `test -f 'layers/layer_pastecanvas.cpp' || echo '$(srcdir)/'`layers/layer_pastecanvas.cpp
+
+layers/libsynfig_la-layer_polygon.lo: layers/layer_polygon.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT layers/libsynfig_la-layer_polygon.lo -MD -MP -MF layers/$(DEPDIR)/libsynfig_la-layer_polygon.Tpo -c -o layers/libsynfig_la-layer_polygon.lo `test -f 'layers/layer_polygon.cpp' || echo '$(srcdir)/'`layers/layer_polygon.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) layers/$(DEPDIR)/libsynfig_la-layer_polygon.Tpo layers/$(DEPDIR)/libsynfig_la-layer_polygon.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layers/layer_polygon.cpp' object='layers/libsynfig_la-layer_polygon.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o layers/libsynfig_la-layer_polygon.lo `test -f 'layers/layer_polygon.cpp' || echo '$(srcdir)/'`layers/layer_polygon.cpp
+
+layers/libsynfig_la-layer_shape.lo: layers/layer_shape.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT layers/libsynfig_la-layer_shape.lo -MD -MP -MF layers/$(DEPDIR)/libsynfig_la-layer_shape.Tpo -c -o layers/libsynfig_la-layer_shape.lo `test -f 'layers/layer_shape.cpp' || echo '$(srcdir)/'`layers/layer_shape.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) layers/$(DEPDIR)/libsynfig_la-layer_shape.Tpo layers/$(DEPDIR)/libsynfig_la-layer_shape.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layers/layer_shape.cpp' object='layers/libsynfig_la-layer_shape.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o layers/libsynfig_la-layer_shape.lo `test -f 'layers/layer_shape.cpp' || echo '$(srcdir)/'`layers/layer_shape.cpp
+
+layers/libsynfig_la-layer_solidcolor.lo: layers/layer_solidcolor.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT layers/libsynfig_la-layer_solidcolor.lo -MD -MP -MF layers/$(DEPDIR)/libsynfig_la-layer_solidcolor.Tpo -c -o layers/libsynfig_la-layer_solidcolor.lo `test -f 'layers/layer_solidcolor.cpp' || echo '$(srcdir)/'`layers/layer_solidcolor.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) layers/$(DEPDIR)/libsynfig_la-layer_solidcolor.Tpo layers/$(DEPDIR)/libsynfig_la-layer_solidcolor.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layers/layer_solidcolor.cpp' object='layers/libsynfig_la-layer_solidcolor.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o layers/libsynfig_la-layer_solidcolor.lo `test -f 'layers/layer_solidcolor.cpp' || echo '$(srcdir)/'`layers/layer_solidcolor.cpp
+
+layers/libsynfig_la-layer_sound.lo: layers/layer_sound.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT layers/libsynfig_la-layer_sound.lo -MD -MP -MF layers/$(DEPDIR)/libsynfig_la-layer_sound.Tpo -c -o layers/libsynfig_la-layer_sound.lo `test -f 'layers/layer_sound.cpp' || echo '$(srcdir)/'`layers/layer_sound.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) layers/$(DEPDIR)/libsynfig_la-layer_sound.Tpo layers/$(DEPDIR)/libsynfig_la-layer_sound.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layers/layer_sound.cpp' object='layers/libsynfig_la-layer_sound.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o layers/libsynfig_la-layer_sound.lo `test -f 'layers/layer_sound.cpp' || echo '$(srcdir)/'`layers/layer_sound.cpp
+
+layers/libsynfig_la-layer_skeleton.lo: layers/layer_skeleton.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT layers/libsynfig_la-layer_skeleton.lo -MD -MP -MF layers/$(DEPDIR)/libsynfig_la-layer_skeleton.Tpo -c -o layers/libsynfig_la-layer_skeleton.lo `test -f 'layers/layer_skeleton.cpp' || echo '$(srcdir)/'`layers/layer_skeleton.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) layers/$(DEPDIR)/libsynfig_la-layer_skeleton.Tpo layers/$(DEPDIR)/libsynfig_la-layer_skeleton.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layers/layer_skeleton.cpp' object='layers/libsynfig_la-layer_skeleton.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o layers/libsynfig_la-layer_skeleton.lo `test -f 'layers/layer_skeleton.cpp' || echo '$(srcdir)/'`layers/layer_skeleton.cpp
+
+layers/libsynfig_la-layer_skeletondeformation.lo: layers/layer_skeletondeformation.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT layers/libsynfig_la-layer_skeletondeformation.lo -MD -MP -MF layers/$(DEPDIR)/libsynfig_la-layer_skeletondeformation.Tpo -c -o layers/libsynfig_la-layer_skeletondeformation.lo `test -f 'layers/layer_skeletondeformation.cpp' || echo '$(srcdir)/'`layers/layer_skeletondeformation.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) layers/$(DEPDIR)/libsynfig_la-layer_skeletondeformation.Tpo layers/$(DEPDIR)/libsynfig_la-layer_skeletondeformation.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layers/layer_skeletondeformation.cpp' object='layers/libsynfig_la-layer_skeletondeformation.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o layers/libsynfig_la-layer_skeletondeformation.lo `test -f 'layers/layer_skeletondeformation.cpp' || echo '$(srcdir)/'`layers/layer_skeletondeformation.cpp
+
+layers/libsynfig_la-layer_switch.lo: layers/layer_switch.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT layers/libsynfig_la-layer_switch.lo -MD -MP -MF layers/$(DEPDIR)/libsynfig_la-layer_switch.Tpo -c -o layers/libsynfig_la-layer_switch.lo `test -f 'layers/layer_switch.cpp' || echo '$(srcdir)/'`layers/layer_switch.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) layers/$(DEPDIR)/libsynfig_la-layer_switch.Tpo layers/$(DEPDIR)/libsynfig_la-layer_switch.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='layers/layer_switch.cpp' object='layers/libsynfig_la-layer_switch.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o layers/libsynfig_la-layer_switch.lo `test -f 'layers/layer_switch.cpp' || echo '$(srcdir)/'`layers/layer_switch.cpp
+
+valuenodes/libsynfig_la-valuenode_add.lo: valuenodes/valuenode_add.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_add.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_add.Tpo -c -o valuenodes/libsynfig_la-valuenode_add.lo `test -f 'valuenodes/valuenode_add.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_add.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_add.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_add.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_add.cpp' object='valuenodes/libsynfig_la-valuenode_add.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_add.lo `test -f 'valuenodes/valuenode_add.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_add.cpp
+
+valuenodes/libsynfig_la-valuenode_and.lo: valuenodes/valuenode_and.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_and.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_and.Tpo -c -o valuenodes/libsynfig_la-valuenode_and.lo `test -f 'valuenodes/valuenode_and.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_and.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_and.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_and.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_and.cpp' object='valuenodes/libsynfig_la-valuenode_and.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_and.lo `test -f 'valuenodes/valuenode_and.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_and.cpp
+
+valuenodes/libsynfig_la-valuenode_anglestring.lo: valuenodes/valuenode_anglestring.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_anglestring.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_anglestring.Tpo -c -o valuenodes/libsynfig_la-valuenode_anglestring.lo `test -f 'valuenodes/valuenode_anglestring.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_anglestring.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_anglestring.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_anglestring.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_anglestring.cpp' object='valuenodes/libsynfig_la-valuenode_anglestring.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_anglestring.lo `test -f 'valuenodes/valuenode_anglestring.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_anglestring.cpp
+
+valuenodes/libsynfig_la-valuenode_animated.lo: valuenodes/valuenode_animated.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_animated.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_animated.Tpo -c -o valuenodes/libsynfig_la-valuenode_animated.lo `test -f 'valuenodes/valuenode_animated.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_animated.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_animated.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_animated.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_animated.cpp' object='valuenodes/libsynfig_la-valuenode_animated.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_animated.lo `test -f 'valuenodes/valuenode_animated.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_animated.cpp
+
+valuenodes/libsynfig_la-valuenode_atan2.lo: valuenodes/valuenode_atan2.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_atan2.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_atan2.Tpo -c -o valuenodes/libsynfig_la-valuenode_atan2.lo `test -f 'valuenodes/valuenode_atan2.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_atan2.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_atan2.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_atan2.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_atan2.cpp' object='valuenodes/libsynfig_la-valuenode_atan2.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_atan2.lo `test -f 'valuenodes/valuenode_atan2.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_atan2.cpp
+
+valuenodes/libsynfig_la-valuenode_bline.lo: valuenodes/valuenode_bline.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_bline.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_bline.Tpo -c -o valuenodes/libsynfig_la-valuenode_bline.lo `test -f 'valuenodes/valuenode_bline.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_bline.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_bline.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_bline.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_bline.cpp' object='valuenodes/libsynfig_la-valuenode_bline.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_bline.lo `test -f 'valuenodes/valuenode_bline.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_bline.cpp
+
+valuenodes/libsynfig_la-valuenode_blinecalctangent.lo: valuenodes/valuenode_blinecalctangent.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_blinecalctangent.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_blinecalctangent.Tpo -c -o valuenodes/libsynfig_la-valuenode_blinecalctangent.lo `test -f 'valuenodes/valuenode_blinecalctangent.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_blinecalctangent.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_blinecalctangent.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_blinecalctangent.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_blinecalctangent.cpp' object='valuenodes/libsynfig_la-valuenode_blinecalctangent.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_blinecalctangent.lo `test -f 'valuenodes/valuenode_blinecalctangent.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_blinecalctangent.cpp
+
+valuenodes/libsynfig_la-valuenode_blinecalcvertex.lo: valuenodes/valuenode_blinecalcvertex.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_blinecalcvertex.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_blinecalcvertex.Tpo -c -o valuenodes/libsynfig_la-valuenode_blinecalcvertex.lo `test -f 'valuenodes/valuenode_blinecalcvertex.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_blinecalcvertex.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_blinecalcvertex.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_blinecalcvertex.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_blinecalcvertex.cpp' object='valuenodes/libsynfig_la-valuenode_blinecalcvertex.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_blinecalcvertex.lo `test -f 'valuenodes/valuenode_blinecalcvertex.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_blinecalcvertex.cpp
+
+valuenodes/libsynfig_la-valuenode_blinecalcwidth.lo: valuenodes/valuenode_blinecalcwidth.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_blinecalcwidth.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_blinecalcwidth.Tpo -c -o valuenodes/libsynfig_la-valuenode_blinecalcwidth.lo `test -f 'valuenodes/valuenode_blinecalcwidth.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_blinecalcwidth.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_blinecalcwidth.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_blinecalcwidth.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_blinecalcwidth.cpp' object='valuenodes/libsynfig_la-valuenode_blinecalcwidth.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_blinecalcwidth.lo `test -f 'valuenodes/valuenode_blinecalcwidth.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_blinecalcwidth.cpp
+
+valuenodes/libsynfig_la-valuenode_blinereversetangent.lo: valuenodes/valuenode_blinereversetangent.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_blinereversetangent.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_blinereversetangent.Tpo -c -o valuenodes/libsynfig_la-valuenode_blinereversetangent.lo `test -f 'valuenodes/valuenode_blinereversetangent.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_blinereversetangent.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_blinereversetangent.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_blinereversetangent.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_blinereversetangent.cpp' object='valuenodes/libsynfig_la-valuenode_blinereversetangent.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_blinereversetangent.lo `test -f 'valuenodes/valuenode_blinereversetangent.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_blinereversetangent.cpp
+
+valuenodes/libsynfig_la-valuenode_compare.lo: valuenodes/valuenode_compare.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_compare.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_compare.Tpo -c -o valuenodes/libsynfig_la-valuenode_compare.lo `test -f 'valuenodes/valuenode_compare.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_compare.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_compare.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_compare.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_compare.cpp' object='valuenodes/libsynfig_la-valuenode_compare.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_compare.lo `test -f 'valuenodes/valuenode_compare.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_compare.cpp
+
+valuenodes/libsynfig_la-valuenode_composite.lo: valuenodes/valuenode_composite.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_composite.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_composite.Tpo -c -o valuenodes/libsynfig_la-valuenode_composite.lo `test -f 'valuenodes/valuenode_composite.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_composite.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_composite.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_composite.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_composite.cpp' object='valuenodes/libsynfig_la-valuenode_composite.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_composite.lo `test -f 'valuenodes/valuenode_composite.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_composite.cpp
+
+valuenodes/libsynfig_la-valuenode_const.lo: valuenodes/valuenode_const.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_const.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_const.Tpo -c -o valuenodes/libsynfig_la-valuenode_const.lo `test -f 'valuenodes/valuenode_const.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_const.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_const.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_const.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_const.cpp' object='valuenodes/libsynfig_la-valuenode_const.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_const.lo `test -f 'valuenodes/valuenode_const.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_const.cpp
+
+valuenodes/libsynfig_la-valuenode_cos.lo: valuenodes/valuenode_cos.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_cos.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_cos.Tpo -c -o valuenodes/libsynfig_la-valuenode_cos.lo `test -f 'valuenodes/valuenode_cos.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_cos.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_cos.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_cos.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_cos.cpp' object='valuenodes/libsynfig_la-valuenode_cos.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_cos.lo `test -f 'valuenodes/valuenode_cos.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_cos.cpp
+
+valuenodes/libsynfig_la-valuenode_dilist.lo: valuenodes/valuenode_dilist.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_dilist.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_dilist.Tpo -c -o valuenodes/libsynfig_la-valuenode_dilist.lo `test -f 'valuenodes/valuenode_dilist.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_dilist.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_dilist.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_dilist.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_dilist.cpp' object='valuenodes/libsynfig_la-valuenode_dilist.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_dilist.lo `test -f 'valuenodes/valuenode_dilist.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_dilist.cpp
+
+valuenodes/libsynfig_la-valuenode_dotproduct.lo: valuenodes/valuenode_dotproduct.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_dotproduct.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_dotproduct.Tpo -c -o valuenodes/libsynfig_la-valuenode_dotproduct.lo `test -f 'valuenodes/valuenode_dotproduct.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_dotproduct.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_dotproduct.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_dotproduct.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_dotproduct.cpp' object='valuenodes/libsynfig_la-valuenode_dotproduct.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_dotproduct.lo `test -f 'valuenodes/valuenode_dotproduct.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_dotproduct.cpp
+
+valuenodes/libsynfig_la-valuenode_duplicate.lo: valuenodes/valuenode_duplicate.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_duplicate.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_duplicate.Tpo -c -o valuenodes/libsynfig_la-valuenode_duplicate.lo `test -f 'valuenodes/valuenode_duplicate.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_duplicate.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_duplicate.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_duplicate.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_duplicate.cpp' object='valuenodes/libsynfig_la-valuenode_duplicate.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_duplicate.lo `test -f 'valuenodes/valuenode_duplicate.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_duplicate.cpp
+
+valuenodes/libsynfig_la-valuenode_dynamiclist.lo: valuenodes/valuenode_dynamiclist.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_dynamiclist.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_dynamiclist.Tpo -c -o valuenodes/libsynfig_la-valuenode_dynamiclist.lo `test -f 'valuenodes/valuenode_dynamiclist.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_dynamiclist.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_dynamiclist.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_dynamiclist.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_dynamiclist.cpp' object='valuenodes/libsynfig_la-valuenode_dynamiclist.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_dynamiclist.lo `test -f 'valuenodes/valuenode_dynamiclist.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_dynamiclist.cpp
+
+valuenodes/libsynfig_la-valuenode_exp.lo: valuenodes/valuenode_exp.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_exp.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_exp.Tpo -c -o valuenodes/libsynfig_la-valuenode_exp.lo `test -f 'valuenodes/valuenode_exp.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_exp.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_exp.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_exp.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_exp.cpp' object='valuenodes/libsynfig_la-valuenode_exp.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_exp.lo `test -f 'valuenodes/valuenode_exp.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_exp.cpp
+
+valuenodes/libsynfig_la-valuenode_gradientcolor.lo: valuenodes/valuenode_gradientcolor.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_gradientcolor.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_gradientcolor.Tpo -c -o valuenodes/libsynfig_la-valuenode_gradientcolor.lo `test -f 'valuenodes/valuenode_gradientcolor.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_gradientcolor.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_gradientcolor.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_gradientcolor.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_gradientcolor.cpp' object='valuenodes/libsynfig_la-valuenode_gradientcolor.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_gradientcolor.lo `test -f 'valuenodes/valuenode_gradientcolor.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_gradientcolor.cpp
+
+valuenodes/libsynfig_la-valuenode_gradientrotate.lo: valuenodes/valuenode_gradientrotate.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_gradientrotate.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_gradientrotate.Tpo -c -o valuenodes/libsynfig_la-valuenode_gradientrotate.lo `test -f 'valuenodes/valuenode_gradientrotate.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_gradientrotate.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_gradientrotate.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_gradientrotate.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_gradientrotate.cpp' object='valuenodes/libsynfig_la-valuenode_gradientrotate.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_gradientrotate.lo `test -f 'valuenodes/valuenode_gradientrotate.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_gradientrotate.cpp
+
+valuenodes/libsynfig_la-valuenode_greyed.lo: valuenodes/valuenode_greyed.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_greyed.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_greyed.Tpo -c -o valuenodes/libsynfig_la-valuenode_greyed.lo `test -f 'valuenodes/valuenode_greyed.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_greyed.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_greyed.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_greyed.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_greyed.cpp' object='valuenodes/libsynfig_la-valuenode_greyed.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_greyed.lo `test -f 'valuenodes/valuenode_greyed.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_greyed.cpp
+
+valuenodes/libsynfig_la-valuenode_integer.lo: valuenodes/valuenode_integer.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_integer.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_integer.Tpo -c -o valuenodes/libsynfig_la-valuenode_integer.lo `test -f 'valuenodes/valuenode_integer.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_integer.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_integer.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_integer.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_integer.cpp' object='valuenodes/libsynfig_la-valuenode_integer.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_integer.lo `test -f 'valuenodes/valuenode_integer.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_integer.cpp
+
+valuenodes/libsynfig_la-valuenode_intstring.lo: valuenodes/valuenode_intstring.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_intstring.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_intstring.Tpo -c -o valuenodes/libsynfig_la-valuenode_intstring.lo `test -f 'valuenodes/valuenode_intstring.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_intstring.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_intstring.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_intstring.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_intstring.cpp' object='valuenodes/libsynfig_la-valuenode_intstring.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_intstring.lo `test -f 'valuenodes/valuenode_intstring.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_intstring.cpp
+
+valuenodes/libsynfig_la-valuenode_join.lo: valuenodes/valuenode_join.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_join.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_join.Tpo -c -o valuenodes/libsynfig_la-valuenode_join.lo `test -f 'valuenodes/valuenode_join.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_join.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_join.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_join.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_join.cpp' object='valuenodes/libsynfig_la-valuenode_join.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_join.lo `test -f 'valuenodes/valuenode_join.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_join.cpp
+
+valuenodes/libsynfig_la-valuenode_linear.lo: valuenodes/valuenode_linear.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_linear.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_linear.Tpo -c -o valuenodes/libsynfig_la-valuenode_linear.lo `test -f 'valuenodes/valuenode_linear.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_linear.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_linear.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_linear.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_linear.cpp' object='valuenodes/libsynfig_la-valuenode_linear.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_linear.lo `test -f 'valuenodes/valuenode_linear.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_linear.cpp
+
+valuenodes/libsynfig_la-valuenode_log.lo: valuenodes/valuenode_log.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_log.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_log.Tpo -c -o valuenodes/libsynfig_la-valuenode_log.lo `test -f 'valuenodes/valuenode_log.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_log.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_log.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_log.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_log.cpp' object='valuenodes/libsynfig_la-valuenode_log.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_log.lo `test -f 'valuenodes/valuenode_log.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_log.cpp
+
+valuenodes/libsynfig_la-valuenode_not.lo: valuenodes/valuenode_not.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_not.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_not.Tpo -c -o valuenodes/libsynfig_la-valuenode_not.lo `test -f 'valuenodes/valuenode_not.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_not.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_not.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_not.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_not.cpp' object='valuenodes/libsynfig_la-valuenode_not.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_not.lo `test -f 'valuenodes/valuenode_not.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_not.cpp
+
+valuenodes/libsynfig_la-valuenode_or.lo: valuenodes/valuenode_or.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_or.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_or.Tpo -c -o valuenodes/libsynfig_la-valuenode_or.lo `test -f 'valuenodes/valuenode_or.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_or.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_or.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_or.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_or.cpp' object='valuenodes/libsynfig_la-valuenode_or.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_or.lo `test -f 'valuenodes/valuenode_or.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_or.cpp
+
+valuenodes/libsynfig_la-valuenode_pow.lo: valuenodes/valuenode_pow.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_pow.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_pow.Tpo -c -o valuenodes/libsynfig_la-valuenode_pow.lo `test -f 'valuenodes/valuenode_pow.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_pow.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_pow.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_pow.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_pow.cpp' object='valuenodes/libsynfig_la-valuenode_pow.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_pow.lo `test -f 'valuenodes/valuenode_pow.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_pow.cpp
+
+valuenodes/libsynfig_la-valuenode_radialcomposite.lo: valuenodes/valuenode_radialcomposite.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_radialcomposite.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_radialcomposite.Tpo -c -o valuenodes/libsynfig_la-valuenode_radialcomposite.lo `test -f 'valuenodes/valuenode_radialcomposite.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_radialcomposite.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_radialcomposite.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_radialcomposite.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_radialcomposite.cpp' object='valuenodes/libsynfig_la-valuenode_radialcomposite.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_radialcomposite.lo `test -f 'valuenodes/valuenode_radialcomposite.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_radialcomposite.cpp
+
+valuenodes/libsynfig_la-valuenode_range.lo: valuenodes/valuenode_range.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_range.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_range.Tpo -c -o valuenodes/libsynfig_la-valuenode_range.lo `test -f 'valuenodes/valuenode_range.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_range.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_range.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_range.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_range.cpp' object='valuenodes/libsynfig_la-valuenode_range.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_range.lo `test -f 'valuenodes/valuenode_range.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_range.cpp
+
+valuenodes/libsynfig_la-valuenode_real.lo: valuenodes/valuenode_real.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_real.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_real.Tpo -c -o valuenodes/libsynfig_la-valuenode_real.lo `test -f 'valuenodes/valuenode_real.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_real.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_real.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_real.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_real.cpp' object='valuenodes/libsynfig_la-valuenode_real.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_real.lo `test -f 'valuenodes/valuenode_real.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_real.cpp
+
+valuenodes/libsynfig_la-valuenode_realstring.lo: valuenodes/valuenode_realstring.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_realstring.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_realstring.Tpo -c -o valuenodes/libsynfig_la-valuenode_realstring.lo `test -f 'valuenodes/valuenode_realstring.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_realstring.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_realstring.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_realstring.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_realstring.cpp' object='valuenodes/libsynfig_la-valuenode_realstring.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_realstring.lo `test -f 'valuenodes/valuenode_realstring.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_realstring.cpp
+
+valuenodes/libsynfig_la-valuenode_reciprocal.lo: valuenodes/valuenode_reciprocal.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_reciprocal.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_reciprocal.Tpo -c -o valuenodes/libsynfig_la-valuenode_reciprocal.lo `test -f 'valuenodes/valuenode_reciprocal.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_reciprocal.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_reciprocal.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_reciprocal.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_reciprocal.cpp' object='valuenodes/libsynfig_la-valuenode_reciprocal.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_reciprocal.lo `test -f 'valuenodes/valuenode_reciprocal.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_reciprocal.cpp
+
+valuenodes/libsynfig_la-valuenode_reference.lo: valuenodes/valuenode_reference.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_reference.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_reference.Tpo -c -o valuenodes/libsynfig_la-valuenode_reference.lo `test -f 'valuenodes/valuenode_reference.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_reference.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_reference.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_reference.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_reference.cpp' object='valuenodes/libsynfig_la-valuenode_reference.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_reference.lo `test -f 'valuenodes/valuenode_reference.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_reference.cpp
+
+valuenodes/libsynfig_la-valuenode_repeat_gradient.lo: valuenodes/valuenode_repeat_gradient.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_repeat_gradient.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_repeat_gradient.Tpo -c -o valuenodes/libsynfig_la-valuenode_repeat_gradient.lo `test -f 'valuenodes/valuenode_repeat_gradient.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_repeat_gradient.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_repeat_gradient.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_repeat_gradient.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_repeat_gradient.cpp' object='valuenodes/libsynfig_la-valuenode_repeat_gradient.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_repeat_gradient.lo `test -f 'valuenodes/valuenode_repeat_gradient.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_repeat_gradient.cpp
+
+valuenodes/libsynfig_la-valuenode_reverse.lo: valuenodes/valuenode_reverse.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_reverse.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_reverse.Tpo -c -o valuenodes/libsynfig_la-valuenode_reverse.lo `test -f 'valuenodes/valuenode_reverse.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_reverse.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_reverse.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_reverse.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_reverse.cpp' object='valuenodes/libsynfig_la-valuenode_reverse.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_reverse.lo `test -f 'valuenodes/valuenode_reverse.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_reverse.cpp
+
+valuenodes/libsynfig_la-valuenode_scale.lo: valuenodes/valuenode_scale.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_scale.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_scale.Tpo -c -o valuenodes/libsynfig_la-valuenode_scale.lo `test -f 'valuenodes/valuenode_scale.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_scale.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_scale.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_scale.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_scale.cpp' object='valuenodes/libsynfig_la-valuenode_scale.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_scale.lo `test -f 'valuenodes/valuenode_scale.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_scale.cpp
+
+valuenodes/libsynfig_la-valuenode_segcalctangent.lo: valuenodes/valuenode_segcalctangent.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_segcalctangent.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_segcalctangent.Tpo -c -o valuenodes/libsynfig_la-valuenode_segcalctangent.lo `test -f 'valuenodes/valuenode_segcalctangent.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_segcalctangent.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_segcalctangent.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_segcalctangent.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_segcalctangent.cpp' object='valuenodes/libsynfig_la-valuenode_segcalctangent.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_segcalctangent.lo `test -f 'valuenodes/valuenode_segcalctangent.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_segcalctangent.cpp
+
+valuenodes/libsynfig_la-valuenode_segcalcvertex.lo: valuenodes/valuenode_segcalcvertex.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_segcalcvertex.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_segcalcvertex.Tpo -c -o valuenodes/libsynfig_la-valuenode_segcalcvertex.lo `test -f 'valuenodes/valuenode_segcalcvertex.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_segcalcvertex.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_segcalcvertex.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_segcalcvertex.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_segcalcvertex.cpp' object='valuenodes/libsynfig_la-valuenode_segcalcvertex.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_segcalcvertex.lo `test -f 'valuenodes/valuenode_segcalcvertex.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_segcalcvertex.cpp
+
+valuenodes/libsynfig_la-valuenode_sine.lo: valuenodes/valuenode_sine.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_sine.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_sine.Tpo -c -o valuenodes/libsynfig_la-valuenode_sine.lo `test -f 'valuenodes/valuenode_sine.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_sine.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_sine.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_sine.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_sine.cpp' object='valuenodes/libsynfig_la-valuenode_sine.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_sine.lo `test -f 'valuenodes/valuenode_sine.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_sine.cpp
+
+valuenodes/libsynfig_la-valuenode_step.lo: valuenodes/valuenode_step.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_step.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_step.Tpo -c -o valuenodes/libsynfig_la-valuenode_step.lo `test -f 'valuenodes/valuenode_step.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_step.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_step.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_step.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_step.cpp' object='valuenodes/libsynfig_la-valuenode_step.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_step.lo `test -f 'valuenodes/valuenode_step.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_step.cpp
+
+valuenodes/libsynfig_la-valuenode_stripes.lo: valuenodes/valuenode_stripes.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_stripes.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_stripes.Tpo -c -o valuenodes/libsynfig_la-valuenode_stripes.lo `test -f 'valuenodes/valuenode_stripes.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_stripes.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_stripes.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_stripes.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_stripes.cpp' object='valuenodes/libsynfig_la-valuenode_stripes.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_stripes.lo `test -f 'valuenodes/valuenode_stripes.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_stripes.cpp
+
+valuenodes/libsynfig_la-valuenode_subtract.lo: valuenodes/valuenode_subtract.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_subtract.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_subtract.Tpo -c -o valuenodes/libsynfig_la-valuenode_subtract.lo `test -f 'valuenodes/valuenode_subtract.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_subtract.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_subtract.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_subtract.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_subtract.cpp' object='valuenodes/libsynfig_la-valuenode_subtract.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_subtract.lo `test -f 'valuenodes/valuenode_subtract.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_subtract.cpp
+
+valuenodes/libsynfig_la-valuenode_switch.lo: valuenodes/valuenode_switch.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_switch.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_switch.Tpo -c -o valuenodes/libsynfig_la-valuenode_switch.lo `test -f 'valuenodes/valuenode_switch.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_switch.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_switch.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_switch.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_switch.cpp' object='valuenodes/libsynfig_la-valuenode_switch.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_switch.lo `test -f 'valuenodes/valuenode_switch.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_switch.cpp
+
+valuenodes/libsynfig_la-valuenode_timedswap.lo: valuenodes/valuenode_timedswap.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_timedswap.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_timedswap.Tpo -c -o valuenodes/libsynfig_la-valuenode_timedswap.lo `test -f 'valuenodes/valuenode_timedswap.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_timedswap.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_timedswap.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_timedswap.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_timedswap.cpp' object='valuenodes/libsynfig_la-valuenode_timedswap.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_timedswap.lo `test -f 'valuenodes/valuenode_timedswap.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_timedswap.cpp
+
+valuenodes/libsynfig_la-valuenode_timeloop.lo: valuenodes/valuenode_timeloop.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_timeloop.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_timeloop.Tpo -c -o valuenodes/libsynfig_la-valuenode_timeloop.lo `test -f 'valuenodes/valuenode_timeloop.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_timeloop.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_timeloop.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_timeloop.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_timeloop.cpp' object='valuenodes/libsynfig_la-valuenode_timeloop.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_timeloop.lo `test -f 'valuenodes/valuenode_timeloop.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_timeloop.cpp
+
+valuenodes/libsynfig_la-valuenode_timestring.lo: valuenodes/valuenode_timestring.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_timestring.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_timestring.Tpo -c -o valuenodes/libsynfig_la-valuenode_timestring.lo `test -f 'valuenodes/valuenode_timestring.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_timestring.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_timestring.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_timestring.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_timestring.cpp' object='valuenodes/libsynfig_la-valuenode_timestring.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_timestring.lo `test -f 'valuenodes/valuenode_timestring.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_timestring.cpp
+
+valuenodes/libsynfig_la-valuenode_twotone.lo: valuenodes/valuenode_twotone.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_twotone.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_twotone.Tpo -c -o valuenodes/libsynfig_la-valuenode_twotone.lo `test -f 'valuenodes/valuenode_twotone.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_twotone.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_twotone.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_twotone.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_twotone.cpp' object='valuenodes/libsynfig_la-valuenode_twotone.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_twotone.lo `test -f 'valuenodes/valuenode_twotone.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_twotone.cpp
+
+valuenodes/libsynfig_la-valuenode_vectorangle.lo: valuenodes/valuenode_vectorangle.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_vectorangle.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_vectorangle.Tpo -c -o valuenodes/libsynfig_la-valuenode_vectorangle.lo `test -f 'valuenodes/valuenode_vectorangle.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_vectorangle.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_vectorangle.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_vectorangle.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_vectorangle.cpp' object='valuenodes/libsynfig_la-valuenode_vectorangle.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_vectorangle.lo `test -f 'valuenodes/valuenode_vectorangle.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_vectorangle.cpp
+
+valuenodes/libsynfig_la-valuenode_vectorlength.lo: valuenodes/valuenode_vectorlength.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_vectorlength.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_vectorlength.Tpo -c -o valuenodes/libsynfig_la-valuenode_vectorlength.lo `test -f 'valuenodes/valuenode_vectorlength.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_vectorlength.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_vectorlength.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_vectorlength.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_vectorlength.cpp' object='valuenodes/libsynfig_la-valuenode_vectorlength.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_vectorlength.lo `test -f 'valuenodes/valuenode_vectorlength.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_vectorlength.cpp
+
+valuenodes/libsynfig_la-valuenode_vectorx.lo: valuenodes/valuenode_vectorx.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_vectorx.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_vectorx.Tpo -c -o valuenodes/libsynfig_la-valuenode_vectorx.lo `test -f 'valuenodes/valuenode_vectorx.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_vectorx.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_vectorx.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_vectorx.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_vectorx.cpp' object='valuenodes/libsynfig_la-valuenode_vectorx.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_vectorx.lo `test -f 'valuenodes/valuenode_vectorx.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_vectorx.cpp
+
+valuenodes/libsynfig_la-valuenode_vectory.lo: valuenodes/valuenode_vectory.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_vectory.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_vectory.Tpo -c -o valuenodes/libsynfig_la-valuenode_vectory.lo `test -f 'valuenodes/valuenode_vectory.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_vectory.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_vectory.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_vectory.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_vectory.cpp' object='valuenodes/libsynfig_la-valuenode_vectory.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_vectory.lo `test -f 'valuenodes/valuenode_vectory.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_vectory.cpp
+
+valuenodes/libsynfig_la-valuenode_boneinfluence.lo: valuenodes/valuenode_boneinfluence.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_boneinfluence.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_boneinfluence.Tpo -c -o valuenodes/libsynfig_la-valuenode_boneinfluence.lo `test -f 'valuenodes/valuenode_boneinfluence.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_boneinfluence.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_boneinfluence.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_boneinfluence.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_boneinfluence.cpp' object='valuenodes/libsynfig_la-valuenode_boneinfluence.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_boneinfluence.lo `test -f 'valuenodes/valuenode_boneinfluence.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_boneinfluence.cpp
+
+valuenodes/libsynfig_la-valuenode_staticlist.lo: valuenodes/valuenode_staticlist.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_staticlist.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_staticlist.Tpo -c -o valuenodes/libsynfig_la-valuenode_staticlist.lo `test -f 'valuenodes/valuenode_staticlist.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_staticlist.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_staticlist.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_staticlist.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_staticlist.cpp' object='valuenodes/libsynfig_la-valuenode_staticlist.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_staticlist.lo `test -f 'valuenodes/valuenode_staticlist.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_staticlist.cpp
+
+valuenodes/libsynfig_la-valuenode_bone.lo: valuenodes/valuenode_bone.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_bone.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_bone.Tpo -c -o valuenodes/libsynfig_la-valuenode_bone.lo `test -f 'valuenodes/valuenode_bone.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_bone.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_bone.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_bone.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_bone.cpp' object='valuenodes/libsynfig_la-valuenode_bone.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_bone.lo `test -f 'valuenodes/valuenode_bone.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_bone.cpp
+
+valuenodes/libsynfig_la-valuenode_boneweightpair.lo: valuenodes/valuenode_boneweightpair.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_boneweightpair.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_boneweightpair.Tpo -c -o valuenodes/libsynfig_la-valuenode_boneweightpair.lo `test -f 'valuenodes/valuenode_boneweightpair.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_boneweightpair.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_boneweightpair.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_boneweightpair.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_boneweightpair.cpp' object='valuenodes/libsynfig_la-valuenode_boneweightpair.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_boneweightpair.lo `test -f 'valuenodes/valuenode_boneweightpair.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_boneweightpair.cpp
+
+valuenodes/libsynfig_la-valuenode_wplist.lo: valuenodes/valuenode_wplist.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_wplist.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_wplist.Tpo -c -o valuenodes/libsynfig_la-valuenode_wplist.lo `test -f 'valuenodes/valuenode_wplist.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_wplist.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_wplist.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_wplist.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_wplist.cpp' object='valuenodes/libsynfig_la-valuenode_wplist.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_wplist.lo `test -f 'valuenodes/valuenode_wplist.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_wplist.cpp
+
+valuenodes/libsynfig_la-valuenode_bonelink.lo: valuenodes/valuenode_bonelink.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_bonelink.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_bonelink.Tpo -c -o valuenodes/libsynfig_la-valuenode_bonelink.lo `test -f 'valuenodes/valuenode_bonelink.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_bonelink.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_bonelink.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_bonelink.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_bonelink.cpp' object='valuenodes/libsynfig_la-valuenode_bonelink.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_bonelink.lo `test -f 'valuenodes/valuenode_bonelink.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_bonelink.cpp
+
+valuenodes/libsynfig_la-valuenode_average.lo: valuenodes/valuenode_average.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_average.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_average.Tpo -c -o valuenodes/libsynfig_la-valuenode_average.lo `test -f 'valuenodes/valuenode_average.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_average.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_average.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_average.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_average.cpp' object='valuenodes/libsynfig_la-valuenode_average.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_average.lo `test -f 'valuenodes/valuenode_average.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_average.cpp
+
+valuenodes/libsynfig_la-valuenode_dynamic.lo: valuenodes/valuenode_dynamic.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_dynamic.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_dynamic.Tpo -c -o valuenodes/libsynfig_la-valuenode_dynamic.lo `test -f 'valuenodes/valuenode_dynamic.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_dynamic.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_dynamic.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_dynamic.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_dynamic.cpp' object='valuenodes/libsynfig_la-valuenode_dynamic.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_dynamic.lo `test -f 'valuenodes/valuenode_dynamic.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_dynamic.cpp
+
+valuenodes/libsynfig_la-valuenode_derivative.lo: valuenodes/valuenode_derivative.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_derivative.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_derivative.Tpo -c -o valuenodes/libsynfig_la-valuenode_derivative.lo `test -f 'valuenodes/valuenode_derivative.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_derivative.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_derivative.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_derivative.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_derivative.cpp' object='valuenodes/libsynfig_la-valuenode_derivative.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_derivative.lo `test -f 'valuenodes/valuenode_derivative.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_derivative.cpp
+
+valuenodes/libsynfig_la-valuenode_weightedaverage.lo: valuenodes/valuenode_weightedaverage.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -MT valuenodes/libsynfig_la-valuenode_weightedaverage.lo -MD -MP -MF valuenodes/$(DEPDIR)/libsynfig_la-valuenode_weightedaverage.Tpo -c -o valuenodes/libsynfig_la-valuenode_weightedaverage.lo `test -f 'valuenodes/valuenode_weightedaverage.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_weightedaverage.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) valuenodes/$(DEPDIR)/libsynfig_la-valuenode_weightedaverage.Tpo valuenodes/$(DEPDIR)/libsynfig_la-valuenode_weightedaverage.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='valuenodes/valuenode_weightedaverage.cpp' object='valuenodes/libsynfig_la-valuenode_weightedaverage.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsynfig_la_CXXFLAGS) $(CXXFLAGS) -c -o valuenodes/libsynfig_la-valuenode_weightedaverage.lo `test -f 'valuenodes/valuenode_weightedaverage.cpp' || echo '$(srcdir)/'`valuenodes/valuenode_weightedaverage.cpp
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-include_synfigHEADERS: $(include_synfig_HEADERS)
+	-rm -rf color/.libs color/_libs
+	-rm -rf layers/.libs layers/_libs
+	-rm -rf valuenodes/.libs valuenodes/_libs
+install-nobase_include_synfigHEADERS: $(nobase_include_synfig_HEADERS)
 	@$(NORMAL_INSTALL)
-	@list='$(include_synfig_HEADERS)'; test -n "$(include_synfigdir)" || list=; \
+	@list='$(nobase_include_synfig_HEADERS)'; test -n "$(include_synfigdir)" || list=; \
 	if test -n "$$list"; then \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(include_synfigdir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(include_synfigdir)" || exit 1; \
 	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_synfigdir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_synfigdir)" || exit $$?; \
+	$(am__nobase_list) | while read dir files; do \
+	  xfiles=; for file in $$files; do \
+	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
+	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
+	  test -z "$$xfiles" || { \
+	    test "x$$dir" = x. || { \
+	      echo " $(MKDIR_P) '$(DESTDIR)$(include_synfigdir)/$$dir'"; \
+	      $(MKDIR_P) "$(DESTDIR)$(include_synfigdir)/$$dir"; }; \
+	    echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(include_synfigdir)/$$dir'"; \
+	    $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(include_synfigdir)/$$dir" || exit $$?; }; \
 	done
 
-uninstall-include_synfigHEADERS:
+uninstall-nobase_include_synfigHEADERS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(include_synfig_HEADERS)'; test -n "$(include_synfigdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	@list='$(nobase_include_synfig_HEADERS)'; test -n "$(include_synfigdir)" || list=; \
+	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
 	dir='$(DESTDIR)$(include_synfigdir)'; $(am__uninstall_files_from_dir)
 
 ID: $(am__tagged_files)
@@ -2338,6 +2635,12 @@ 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)
+	-rm -f color/$(DEPDIR)/$(am__dirstamp)
+	-rm -f color/$(am__dirstamp)
+	-rm -f layers/$(DEPDIR)/$(am__dirstamp)
+	-rm -f layers/$(am__dirstamp)
+	-rm -f valuenodes/$(DEPDIR)/$(am__dirstamp)
+	-rm -f valuenodes/$(am__dirstamp)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -2349,7 +2652,7 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+	-rm -rf ./$(DEPDIR) color/$(DEPDIR) layers/$(DEPDIR) valuenodes/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -2366,7 +2669,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-include_synfigHEADERS
+install-data-am: install-nobase_include_synfigHEADERS
 
 install-dvi: install-dvi-am
 
@@ -2395,7 +2698,7 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+	-rm -rf ./$(DEPDIR) color/$(DEPDIR) layers/$(DEPDIR) valuenodes/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -2412,7 +2715,8 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-include_synfigHEADERS uninstall-libLTLIBRARIES
+uninstall-am: uninstall-libLTLIBRARIES \
+	uninstall-nobase_include_synfigHEADERS
 
 .MAKE: install-am install-strip
 
@@ -2422,15 +2726,17 @@ uninstall-am: uninstall-include_synfigHEADERS uninstall-libLTLIBRARIES
 	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-include_synfigHEADERS install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libLTLIBRARIES install-man \
+	install-nobase_include_synfigHEADERS 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 \
-	uninstall-include_synfigHEADERS uninstall-libLTLIBRARIES
+	tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \
+	uninstall-nobase_include_synfigHEADERS
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/src/synfig/base_types.cpp b/src/synfig/base_types.cpp
index ea1f789..6b42f83 100644
--- a/src/synfig/base_types.cpp
+++ b/src/synfig/base_types.cpp
@@ -35,7 +35,7 @@
 #include "value.h"
 #include "general.h"
 #include "canvas.h"
-#include "valuenode_bone.h"
+#include "valuenodes/valuenode_bone.h"
 #include "gradient.h"
 #include "bone.h"
 #include "matrix.h"
diff --git a/src/synfig/blinepoint.cpp b/src/synfig/blinepoint.cpp
index dbae40a..c41228d 100644
--- a/src/synfig/blinepoint.cpp
+++ b/src/synfig/blinepoint.cpp
@@ -46,7 +46,6 @@ using namespace synfig;
 
 /* === M E T H O D S ======================================================= */
 
-//TODO: write reverse for rest of flags cases.
 void
 synfig::BLinePoint::reverse()
 {
@@ -57,9 +56,25 @@ synfig::BLinePoint::reverse()
 		tangent_[1]=-tangent_[1];
 	}
 	else
+	if(merge_tangent_both_)
 	{
 		tangent_[0]=-tangent_[0];
 		tangent_[1]=-tangent_[1];
+	}
+	else
+	if(split_tangent_radius_)
+	{
+		Real mag0 = tangent_[0].mag(), mag1 = tangent_[1].mag();
+		tangent_[0]=Vector(-mag1, mag0==0?Angle::rad(0):tangent_[0].angle());
+		tangent_[1]=Vector(-mag0, mag1==0?Angle::rad(0):tangent_[1].angle());
+		update_tangent2();
+	}
+	else
+	{
+		Real mag0 = tangent_[0].mag(), mag1 = tangent_[1].mag();
+		Angle angle0 = mag0==0?Angle::rad(0):tangent_[0].angle();
+		tangent_[0]=Vector(-mag0, mag1==0?Angle::rad(0):tangent_[1].angle());
+		tangent_[1]=Vector(-mag1, angle0);
 		update_tangent2();
 	}
 }
@@ -67,7 +82,7 @@ synfig::BLinePoint::reverse()
 void
 synfig::BLinePoint::update_tangent2()
 {
-	if(tangent_[0].mag() != 0)
+	if(tangent_[0].mag_squared() != 0)
 		tangent2_radius_split_=Vector(tangent_[1].mag(), tangent_[0].angle());
 	else
 		tangent2_radius_split_=tangent_[1];
diff --git a/src/synfig/bone.cpp b/src/synfig/bone.cpp
index 72609b1..2f8d35d 100644
--- a/src/synfig/bone.cpp
+++ b/src/synfig/bone.cpp
@@ -32,7 +32,7 @@
 
 #include "bone.h"
 #include "guid.h"
-#include "valuenode_bone.h"
+#include "valuenodes/valuenode_bone.h"
 #include <ETL/stringf>
 #include <algorithm>
 #include <cmath>
diff --git a/src/synfig/canvas.cpp b/src/synfig/canvas.cpp
index 0ac1040..17e1d5f 100644
--- a/src/synfig/canvas.cpp
+++ b/src/synfig/canvas.cpp
@@ -36,9 +36,9 @@
 #include "exception.h"
 #include "time.h"
 #include "context.h"
-#include "layer_pastecanvas.h"
-#include "valuenode_const.h"
-#include "valuenode_scale.h"
+#include <synfig/layers/layer_pastecanvas.h>
+#include <synfig/valuenodes/valuenode_const.h>
+#include <synfig/valuenodes/valuenode_scale.h>
 #include "loadcanvas.h"
 #include "filesystemnative.h"
 #include <sigc++/bind.h>
diff --git a/src/synfig/color.cpp b/src/synfig/color.cpp
deleted file mode 100644
index 0f82be4..0000000
--- a/src/synfig/color.cpp
+++ /dev/null
@@ -1,1200 +0,0 @@
-/* === S Y N F I G ========================================================= */
-/*!	\file color.cpp
-**	\brief Color Class
-**
-**	$Id$
-**
-**	\legal
-**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**	Copyright (c) 2007, 2008 Chris Moore
-**	Copyright (c) 2012-2013 Carlos López
-**
-**	This package is free software; you can redistribute it and/or
-**	modify it under the terms of the GNU General Public License as
-**	published by the Free Software Foundation; either version 2 of
-**	the License, or (at your option) any later version.
-**
-**	This package is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-**	General Public License for more details.
-**	\endlegal
-*/
-/* ========================================================================= */
-
-/* === H E A D E R S ======================================================= */
-
-#ifdef USING_PCH
-#	include "pch.h"
-#else
-#ifdef HAVE_CONFIG_H
-#	include <config.h>
-#endif
-
-#include <ETL/angle>
-#include "color.h"
-#include <cstdio>
-#include <sstream>
-#include <iostream>
-#include <iomanip>
-
-#endif
-
-using namespace synfig;
-using namespace etl;
-using namespace std;
-
-/* === M A C R O S ========================================================= */
-
-#define COLOR_EPSILON	(0.000001f)
-
-/* === G L O B A L S ======================================================= */
-const Color::value_type Color::ceil=1;
-const Color::value_type Color::floor=0;
-const float CairoColor::range=CairoColor::ceil-CairoColor::floor;
-/* === P R O C E D U R E S ================================================= */
-
-/* === M E T H O D S ======================================================= */
-
-
-
-ColorReal
-Color::hex2real(String s)
-{
-	std::istringstream i(s);
-	int n;
-	i.fill('0');
-	if (!(i >> hex >> n))
-		throw String("bad conversion from hex string \"") + s + String("\"");
-	return n / 255.0f;
-}
-
-unsigned char
-CairoColor::hex2char(String s)
-{
-	ColorReal cr(Color::hex2real(s));
-	return (unsigned char)(cr*255.0f);
-}
-
-const String
-Color::real2hex(ColorReal c)
-{
-	std::ostringstream o;
-	o.width(2);
-	o.fill('0');
-	if (c<0) c = 0;
-	if (c>1) c = 1;
-	o << hex << int(c*255.0f);
-	return o.str();
-}
-
-const String
-CairoColor::char2hex(unsigned char c)
-{
-	String s(Color::real2hex((ColorReal)(c/((float)ceil))));
-	return s.c_str();
-}
-
-void
-Color::set_hex(String& str)
-{
-	value_type r, g, b;
-	String hex;
-
-	// use just the hex characters
-	for (String::const_iterator iter = str.begin(); iter != str.end(); iter++)
-		if (isxdigit(*iter))
-			hex.push_back(*iter);
-
-	try
-	{
-		if (hex.size() == 1)
-		{
-			r = hex2real(hex.substr(0,1)+hex.substr(0,1));
-			r_ = g_ = b_ = r;
-		}
-		else if (hex.size() == 3)
-		{
-			r = hex2real(hex.substr(0,1)+hex.substr(0,1));
-			g = hex2real(hex.substr(1,1)+hex.substr(1,1));
-			b = hex2real(hex.substr(2,1)+hex.substr(2,1));
-			r_ = r; g_ = g; b_ = b;
-		}
-		else if (hex.size() == 6)
-		{
-			r = hex2real(hex.substr(0,2));
-			g = hex2real(hex.substr(2,2));
-			b = hex2real(hex.substr(4,2));
-			r_ = r; g_ = g; b_ = b;
-		}
-	}
-	catch (string s)
-	{
-		printf("caught <%s>\n", s.c_str());
-		return;
-	}
-}
-
-void 
-CairoColor::set_hex(String& str)
-{
-	CairoColor ret(*this);
-	Color c;
-	c.set_hex(str);
-	c=c.clamped();
-	ret=CairoColor(c);
-}
-
-const String
-Color::get_string(void)const
-{
-	std::ostringstream o;
-	o << std::fixed << std::setprecision(3) << "#" << get_hex().c_str() << " : " << std::setw(6) << a_;
-	return String(o.str().c_str());
-}
-
-const String
-CairoColor::get_string(void)const
-{
-	std::ostringstream o;
-	o << std::fixed << std::setprecision(3) << "#" << get_hex().c_str() << " : " << std::setw(6) << get_a();
-	return String(o.str().c_str());
-}
-
-Color
-Color::clamped_negative()const
-{
-	Color ret=*this;
-
-	if(ret.a_==0)
-		return alpha();
-
-	if(ret.a_<0)
-		ret=-ret;
-
-	if(ret.r_<0)
-	{
-		ret.g_-=ret.r_;
-		ret.b_-=ret.r_;
-		ret.r_=0.0f;
-	}
-	if(ret.g_<0)
-	{
-		ret.r_-=ret.g_;
-		ret.b_-=ret.g_;
-		ret.g_=0.0f;
-	}
-	if(ret.b_<0)
-	{
-		ret.r_-=ret.b_;
-		ret.g_-=ret.b_;
-		ret.b_=0.0f;
-	}
-
-	if(ret.r_>1) ret.r_=1;
-	if(ret.g_>1) ret.g_=1;
-	if(ret.b_>1) ret.b_=1;
-	if(ret.a_>1) ret.a_=1;
-
-	if(isnan(ret.get_r())) ret.r_=0.5;
-	if(isnan(ret.get_g())) ret.g_=0.5;
-	if(isnan(ret.get_b())) ret.b_=0.5;
-	if(isnan(ret.get_a())) ret.a_=1;
-
-/*
-	if(ret.r_>1) { ret.g_/=ret.r_; ret.b_/=ret.r_; ret.r_=1; }
-	if(ret.g_>1) { ret.r_/=ret.g_; ret.b_/=ret.g_; ret.g_=1; }
-	if(ret.b_>1) { ret.g_/=ret.b_; ret.r_/=ret.b_; ret.b_=1; }
-	if(ret.a_>1) ret.a_=1;
-*/
-
-	return ret;
-}
-
-Color
-Color::clamped()const
-{
-	Color ret(*this);
-	if(ret.get_r()<0)
-		ret.set_r(0);
-	if(ret.get_g()<0)
-		ret.set_g(0);
-	if(ret.get_b()<0)
-		ret.set_b(0);
-	if(ret.get_a()<0)
-		ret.set_a(0);
-
-	if(ret.r_>1) ret.r_=1;
-	if(ret.g_>1) ret.g_=1;
-	if(ret.b_>1) ret.b_=1;
-	if(ret.a_>1) ret.a_=1;
-
-	if(isnan(ret.get_r())) ret.r_=0.5;
-	if(isnan(ret.get_g())) ret.g_=0.5;
-	if(isnan(ret.get_b())) ret.b_=0.5;
-	if(isnan(ret.get_a())) ret.a_=1;
-
-	return(ret);
-}
-
-Color::Color(const CairoColor& c)
-	{
-		float div=1.0/((float)(CairoColor::ceil-CairoColor::floor));
-		set_r((ceil-floor)*c.get_r()*div);
-		set_g((ceil-floor)*c.get_g()*div);
-		set_b((ceil-floor)*c.get_b()*div);
-		set_a((ceil-floor)*c.get_a()*div);
-	}
-
-
-typedef Color (*blendfunc)(Color &,Color &,float);
-typedef CairoColor (*cairoblendfunc)(CairoColor&, CairoColor&, float);
-
-template <class C>
-static C
-blendfunc_COMPOSITE(C &src,C &dest,float amount)
-{
-	//c_dest'=c_src+(1.0-a_src)*c_dest
-	//a_dest'=a_src+(1.0-a_src)*a_dest
-
-	float a_src=src.get_a()*amount;
-	float a_dest=dest.get_a();
-	const float one(C::ceil); 
-
-	// if a_arc==0.0
-	//if(fabsf(a_src)<COLOR_EPSILON) return dest;
-
-	// Scale the source and destination by their alpha values
-	src*=a_src;
-	dest*=a_dest;
-
-	dest=src + dest*(one-a_src);
-
-	a_dest=a_src + a_dest*(one-a_src);
-
-	// if a_dest!=0.0
-	if(fabsf(a_dest)>COLOR_EPSILON)
-	{
-		dest/=a_dest;
-		dest.set_a(a_dest);
-	}
-	else
-	{
-		dest=C::alpha();
-	}
-	assert(dest.is_valid());
-	return dest;
-}
-
-//Specialization for CairoColor
-template <>
-CairoColor
-blendfunc_COMPOSITE(CairoColor &a, CairoColor &b, float amount)
-{
-	int ra, ga, ba, aa;
-	int rb, gb, bb, ab;
-	int rc, gc, bc;
-	float ac;
-	
-	float faa, fab, A, AA;
-	
-	ra=a.get_r();
-	ga=a.get_g();
-	ba=a.get_b();
-	aa=a.get_a();
-	aa=aa*amount;
-	A=aa/255.0;
-	AA=1.0-A;
-	
-	rb=b.get_r();
-	gb=b.get_g();
-	bb=b.get_b();
-	ab=b.get_a();
-
-	ac=aa+ab*AA;
-	if(fabsf(ac)<COLOR_EPSILON)
-		return CairoColor::alpha();
-
-	faa=aa/ac;
-	fab=ab*AA/ac;
-
-	rc=ra*faa+rb*fab;
-	gc=ga*faa+gb*fab;
-	bc=ba*faa+bb*fab;
-	
-	return CairoColor(rc, gc, bc, ac);
-
-}
-
-
-template <class C>
-static C
-blendfunc_STRAIGHT(C &src,C &bg,float amount)
-{
-	//a_out'=(a_src-a_bg)*amount+a_bg
-	//c_out'=(((c_src*a_src)-(c_bg*a_bg))*amount+(c_bg*a_bg))/a_out'
-
-	// ie: if(amount==1.0)
-	//if(fabsf(amount-1.0f)<COLOR_EPSILON)return src;
-
-	C out;
-
-	float a_out((src.get_a()-bg.get_a())*amount+bg.get_a());
-
-	// if a_out!=0.0
-	if(fabsf(a_out)>COLOR_EPSILON)
-//	if(a_out>COLOR_EPSILON || a_out<-COLOR_EPSILON)
-	{
-		out=((src*src.get_a()-bg*bg.get_a())*amount+bg*bg.get_a())/a_out;
-		out.set_a(a_out);
-	}
-	else
-		out=C::alpha();
-
-	assert(out.is_valid());
-	return out;
-}
-
-//Specialization for CairoColor
-template <>
-CairoColor
-blendfunc_STRAIGHT(CairoColor &a, CairoColor &b, float amount)
-{	
-	int ra, ga, ba, aa; //src
-	int rb, gb, bb, ab; //bg
-	int rc, gc, bc;
-	float ac; //out
-	
-	ra=a.get_r();
-	ga=a.get_g();
-	ba=a.get_b();
-	aa=a.get_a();
-	
-	rb=b.get_r();
-	gb=b.get_g();
-	bb=b.get_b();
-	ab=b.get_a();
-	
-	ac=(aa-ab)*amount+ab;
-	
-	// if ac!=0.0
-	if(fabsf(ac)>COLOR_EPSILON)
-	{
-		rc= ((ra*aa-rb*ab)*amount + rb*ab)/ac;
-		gc= ((ga*aa-gb*ab)*amount + gb*ab)/ac;
-		bc= ((ba*aa-bb*ab)*amount + bb*ab)/ac;
-		return CairoColor(rc, gc, bc, ac);
-	}
-	else
-		return CairoColor::alpha();
-}
-
-
-template <class C>
-static C
-blendfunc_ONTO(C &a,C &b,float amount)
-{
-	float alpha(b.get_a());
-	const float one(C::ceil);
-	return blendfunc_COMPOSITE(a,b.set_a(one),amount).set_a(alpha);
-}
-
-template <>
-CairoColor
-blendfunc_ONTO(CairoColor &a, CairoColor &b, float amount)
-{
-	unsigned char alpha(b.get_a());
-	return blendfunc_COMPOSITE(a,b.set_a(255),amount).set_a(alpha);
-}
-
-
-template <class C>
-static C
-blendfunc_STRAIGHT_ONTO(C &a,C &b,float amount)
-{
-	a.set_a(a.get_a()*b.get_a());
-	return blendfunc_STRAIGHT(a,b,amount);
-}
-
-template <>
-CairoColor
-blendfunc_STRAIGHT_ONTO(CairoColor &a, CairoColor &b, float amount)
-{
-	a.set_a(a.get_a()*b.get_a()/255.0);
-	return CairoColor::blend(a, b, amount, Color::BLEND_STRAIGHT);
-}
-
-template <class C>
-static C
-blendfunc_BRIGHTEN(C &a,C &b,float amount)
-{
-	const float alpha(a.get_a()*amount);
-
-	if(b.get_r()<a.get_r()*alpha)
-		b.set_r(a.get_r()*alpha);
-
-	if(b.get_g()<a.get_g()*alpha)
-		b.set_g(a.get_g()*alpha);
-
-	if(b.get_b()<a.get_b()*alpha)
-		b.set_b(a.get_b()*alpha);
-
-	return b;
-}
-
-//Specialization for CairoColor
-template <>
-CairoColor
-blendfunc_BRIGHTEN(CairoColor &a, CairoColor &b, float amount)
-{
-	int ra, ga, ba, aa;
-	int rb, gb, bb, ab;
-	int rc, gc, bc, ac;
-	
-	ra=a.get_r();
-	ga=a.get_g();
-	ba=a.get_b();
-	aa=a.get_a();
-	
-	rb=b.get_r();
-	gb=b.get_g();
-	bb=b.get_b();
-	ab=b.get_a();
-	
-	const float alpha = aa*amount/255.0;
-	const int raab(ra*alpha);
-	const int gaab(ga*alpha);
-	const int baab(ba*alpha);
-	
-	if(rb<raab)
-		rc=raab;
-	else
-		rc=rb;
-		
-	if(gb<gaab)
-		gc=gaab;
-	else
-		gc=gb;
-	
-	if(bb<baab)
-		bc=baab;
-	else
-		bc=bb;
-
-	ac=ab;
-		
-	return CairoColor(rc, gc, bc, ac);
-}
-
-template <class C>
-static C
-blendfunc_DARKEN(C &a,C &b,float amount)
-{
-	const float alpha(a.get_a()*amount);
-	const float one(C::ceil);
-	
-	if(b.get_r()>(a.get_r()-one)*alpha+one)
-		b.set_r((a.get_r()-one)*alpha+one);
-
-	if(b.get_g()>(a.get_g()-one)*alpha+one)
-		b.set_g((a.get_g()-one)*alpha+one);
-
-	if(b.get_b()>(a.get_b()-one)*alpha+one)
-		b.set_b((a.get_b()-one)*alpha+one);
-
-
-	return b;
-}
-
-//Specialization for CairoColor
-template <>
-CairoColor
-blendfunc_DARKEN(CairoColor &a, CairoColor &b, float amount)
-{
-	int ra, ga, ba, aa;
-	int rb, gb, bb, ab;
-	int rc, gc, bc, ac;
-	
-	ra=a.get_r();
-	ga=a.get_g();
-	ba=a.get_b();
-	aa=a.get_a();
-	
-	rb=b.get_r();
-	gb=b.get_g();
-	bb=b.get_b();
-	ab=b.get_a();
-	
-	const float alpha=aa*amount/255.0;
-
-	int rcompare=(ra-255)*alpha+255;
-	if(rb > rcompare)
-		rc=rcompare;
-	else
-		rc=rb;
-		
-	int gcompare=(ga-255)*alpha+255;
-	if(gb > gcompare)
-		gc=gcompare;
-	else
-		gc=gb;
-
-	int bcompare=(ba-255)*alpha+255;
-	if(bb > bcompare)
-		bc=bcompare;
-	else
-		bc=bb;
-	
-	ac=ab;
-	
-	return CairoColor(rc, gc, bc, ac);
-}
-
-template <class C>
-static C
-blendfunc_ADD(C &a,C &b,float amount)
-{
-	const float alpha(a.get_a()*amount);
-
-	b.set_r(b.get_r()+a.get_r()*alpha);
-	b.set_g(b.get_g()+a.get_g()*alpha);
-	b.set_b(b.get_b()+a.get_b()*alpha);
-
-	return b;
-}
-
-//Specialization for CairoColor
-template <>
-CairoColor
-blendfunc_ADD(CairoColor &a, CairoColor &b, float amount)
-{
-	int ra, ga, ba, aa;
-	int rb, gb, bb, ab;
-	int rc, gc, bc, ac;
-	
-	ra=a.get_r();
-	ga=a.get_g();
-	ba=a.get_b();
-	aa=a.get_a();
-	
-	rb=b.get_r();
-	gb=b.get_g();
-	bb=b.get_b();
-	ab=b.get_a();
-	
-	const float aaa=aa*amount/255.0;
-	
-	rc=rb+ra*aaa;
-	gc=gb+ga*aaa;
-	bc=bb+ba*aaa;
-	ac=ab;
-
-	return CairoColor(rc, gc, bc, ac);
-}
-
-template <class C>
-static C
-blendfunc_SUBTRACT(C &a,C &b,float amount)
-{
-	const float alpha(a.get_a()*amount);
-
-	b.set_r(b.get_r()-a.get_r()*alpha);
-	b.set_g(b.get_g()-a.get_g()*alpha);
-	b.set_b(b.get_b()-a.get_b()*alpha);
-
-	return b;
-}
-
-//Specialization for CairoColor
-template <>
-CairoColor
-blendfunc_SUBTRACT(CairoColor &a, CairoColor &b, float amount)
-{
-	int ra, ga, ba, aa;
-	int rb, gb, bb, ab;
-	int rc, gc, bc, ac;
-	
-	ra=a.get_r();
-	ga=a.get_g();
-	ba=a.get_b();
-	aa=a.get_a();
-	
-	rb=b.get_r();
-	gb=b.get_g();
-	bb=b.get_b();
-	ab=b.get_a();
-	
-	const float aaa=aa*amount/255.0;
-	
-	rc=rb-ra*aaa;
-	gc=gb-ga*aaa;
-	bc=bb-ba*aaa;
-	ac=ab;
-	
-	return CairoColor(rc, gc, bc, ac);
-}
-
-template <class C>
-static C
-blendfunc_DIFFERENCE(C &a,C &b,float amount)
-{
-	const float alpha(a.get_a()*amount);
-
-	b.set_r(abs(b.get_r()-a.get_r()*alpha));
-	b.set_g(abs(b.get_g()-a.get_g()*alpha));
-	b.set_b(abs(b.get_b()-a.get_b()*alpha));
-
-	return b;
-}
-
-//Specialization for CairoColor
-template <>
-CairoColor
-blendfunc_DIFFERENCE(CairoColor &a, CairoColor &b, float amount)
-{
-	int ra, ga, ba, aa;
-	int rb, gb, bb, ab;
-	int rc, gc, bc, ac;
-	
-	ra=a.get_r();
-	ga=a.get_g();
-	ba=a.get_b();
-	aa=a.get_a();
-	
-	rb=b.get_r();
-	gb=b.get_g();
-	bb=b.get_b();
-	ab=b.get_a();
-	
-	const float aaa=aa*amount/255.0;
-	
-	rc=abs(rb-ra*aaa);
-	gc=abs(gb-ga*aaa);
-	bc=abs(bb-ba*aaa);
-	ac=ab;
-	
-	return CairoColor(rc, gc, bc, ac);
-}
-
-template <class C>
-static C
-blendfunc_MULTIPLY(C &a,C &b,float amount)
-{
-	if(amount<0) a=~a, amount=-amount;
-
-	amount*=a.get_a();
-	b.set_r(((b.get_r()*a.get_r())-b.get_r())*(amount)+b.get_r());
-	b.set_g(((b.get_g()*a.get_g())-b.get_g())*(amount)+b.get_g());
-	b.set_b(((b.get_b()*a.get_b())-b.get_b())*(amount)+b.get_b());
-	return b;
-}
-
-template <>
-CairoColor
-blendfunc_MULTIPLY(CairoColor &a,CairoColor &b, float amount)
-{
-	if(amount<0) a=~a, amount=-amount;
-	amount*=a.get_a()/255.0;
-	int ra, ga, ba;
-	int rb, gb, bb;
-
-	ra=a.get_r();
-	ga=a.get_g();
-	ba=a.get_b();
-	
-	rb=b.get_r();
-	gb=b.get_g();
-	bb=b.get_b();
-	
-	b.set_r((rb*ra*amount/255.0)+rb*(1.0-amount));
-	b.set_g((gb*ga*amount/255.0)+gb*(1.0-amount));
-	b.set_b((bb*ba*amount/255.0)+bb*(1.0-amount));
-	return b;
-}
-
-template <class C>
-static C
-blendfunc_DIVIDE(C &a,C &b,float amount)
-{
-	amount*=a.get_a();
-
-	// We add COLOR_EPSILON in order to avoid a divide-by-zero condition.
-	// This causes DIVIDE to bias toward positive values, but the effect is
-	// really negligible. There is a reason why we use COLOR_EPSILON--we
-	// want the change to be imperceptible.
-
-	b.set_r(((b.get_r()/(a.get_r()+COLOR_EPSILON))-b.get_r())*(amount)+b.get_r());
-	b.set_g(((b.get_g()/(a.get_g()+COLOR_EPSILON))-b.get_g())*(amount)+b.get_g());
-	b.set_b(((b.get_b()/(a.get_b()+COLOR_EPSILON))-b.get_b())*(amount)+b.get_b());
-
-	return b;
-}
-
-// Specialization for CairoColor
-template <>
-CairoColor
-blendfunc_DIVIDE(CairoColor &a, CairoColor &b, float amount)
-{
-	int ra, ga, ba, aa;
-	int rb, gb, bb, ab;
-	int rc, gc, bc, ac;
-
-	ra=a.get_r();
-	ga=a.get_g();
-	ba=a.get_b();
-	aa=a.get_a();
-	
-	rb=b.get_r();
-	gb=b.get_g();
-	bb=b.get_b();
-	ab=b.get_a();
-	
-	const float alpha=amount*aa/255.0;
-	const float ahpla=1.0-alpha;
-	
-	if(alpha<COLOR_EPSILON)
-		return b;
-	
-	ac=ab;
-	if(ra==0)
-		rc=rb;
-	else
-		rc=rb*(alpha*255)/(ra) + ahpla*rb;
-		
-	if(ga==0)
-		gc=gb;
-	else
-		gc=gb*(alpha*255)/(ga) + ahpla*gb;
-		
-	if(ba==0)
-		bc=bb;
-	else
-		bc=bb*(alpha*255)/(ba) + ahpla*bb;
-		
-	return CairoColor(rc, gc, bc, ac);
-}
-
-template <class C>
-static C
-blendfunc_COLOR(C &a,C &b,float amount)
-{
-	C temp(b);
-	temp.set_uv(a.get_u(),a.get_v());
-	return (temp-b)*amount*a.get_a()+b;
-}
-
-
-template <>
-CairoColor
-blendfunc_COLOR(CairoColor &a, CairoColor &b, float amount)
-{
-	return CairoColor(Color::blend(Color(a), Color(b), amount, Color::BLEND_COLOR));
-}
-
-
-template <class C>
-static C
-blendfunc_HUE(C &a,C &b,float amount)
-{
-	C temp(b);
-	temp.set_hue(a.get_hue());
-	return (temp-b)*amount*a.get_a()+b;
-}
-
-template <>
-CairoColor
-blendfunc_HUE(CairoColor &a, CairoColor &b, float amount)
-{
-	return CairoColor(Color::blend(Color(a), Color(b), amount, Color::BLEND_HUE));
-}
-
-template <class C>
-static C
-blendfunc_SATURATION(C &a,C &b,float amount)
-{
-	C temp(b);
-	temp.set_s(a.get_s());
-	return (temp-b)*amount*a.get_a()+b;
-}
-
-template <>
-CairoColor
-blendfunc_SATURATION(CairoColor &a, CairoColor &b, float amount)
-{
-	return CairoColor(Color::blend(Color(a), Color(b), amount, Color::BLEND_SATURATION));
-}
-
-template <class C>
-static C
-blendfunc_LUMINANCE(C &a,C &b,float amount)
-{
-	C temp(b);
-	temp.set_y(a.get_y());
-	return (temp-b)*amount*a.get_a()+b;
-}
-
-template <>
-CairoColor
-blendfunc_LUMINANCE(CairoColor &a, CairoColor &b, float amount)
-{
-	return CairoColor(Color::blend(Color(a), Color(b), amount, Color::BLEND_LUMINANCE));
-}
-
-template <class C>
-static C
-blendfunc_BEHIND(C &a,C &b,float amount)
-{
-	if(a.get_a()==0)
-		a.set_a(COLOR_EPSILON*amount);		//!< \todo this is a hack
-	else
-		a.set_a(a.get_a()*amount);
-	return blendfunc_COMPOSITE(b,a,1.0);
-}
-
-template <>
-CairoColor
-blendfunc_BEHIND(CairoColor &a, CairoColor &b, float amount)
-{
-	a.set_a(a.get_a()*amount);
-	return CairoColor::blend(b, a, 1.0, Color::BLEND_COMPOSITE);
-}
-
-
-template <class C>
-static C
-blendfunc_ALPHA_BRIGHTEN(C &a,C &b,float amount)
-{
-	// \todo can this be right, multiplying amount by *b*'s alpha?
-	// compare with blendfunc_BRIGHTEN where it is multiplied by *a*'s
-	if(a.get_a() < b.get_a()*amount)
-		return a.set_a(a.get_a()*amount);
-	return b;
-}
-
-//Specialization for CairoColor
-template <>
-CairoColor
-blendfunc_ALPHA_BRIGHTEN(CairoColor &a, CairoColor &b, float amount)
-{
-	// \todo can this be right, multiplying amount by *b*'s alpha?
-	// compare with blendfunc_BRIGHTEN where it is multiplied by *a*'s
-	//if(a.get_a() < b.get_a()*amount)
-	//	return a.set_a(a.get_a()*amount);
-	//return b;
-	unsigned char ra, ga, ba, aa;
-	unsigned char ab;
-	unsigned char rc, gc, bc, ac;
-	
-	ra=a.get_r();
-	ga=a.get_g();
-	ba=a.get_b();
-	aa=a.get_a();
-	
-	ab=b.get_a();
-	
-	ac=aa*amount;
-	if(aa < ab*amount)
-	{
-		float acaa=(aa*amount)/aa;
-		rc=ra*acaa;
-		gc=ga*acaa;
-		bc=ba*acaa;
-		return CairoColor(rc, gc, bc, ac);
-	}
-	else
-		return b;
-	
-	
-}
-
-template <class C>
-static C
-blendfunc_ALPHA_DARKEN(C &a,C &b,float amount)
-{
-	if(a.get_a()*amount > b.get_a())
-		return a.set_a(a.get_a()*amount);
-	return b;
-}
-
-//Specialization for CairoColor
-template <>
-CairoColor
-blendfunc_ALPHA_DARKEN(CairoColor &a, CairoColor &b, float amount)
-{
-	unsigned char ra, ga, ba, aa;
-	unsigned char ab;
-	unsigned char rc, gc, bc, ac;
-	
-	ra=a.get_r();
-	ga=a.get_g();
-	ba=a.get_b();
-	aa=a.get_a();
-	
-	ab=b.get_a();
-	
-	ac=aa*amount;
-	if(ac > ab)
-	{
-		float acaa=(aa*amount)/aa;
-		rc=ra*acaa;
-		gc=ga*acaa;
-		bc=ba*acaa;
-		return CairoColor(rc, gc, bc, ac);
-	}
-	else
-		return b;
-}
-
-
-template <class C>
-static C
-blendfunc_SCREEN(C &a,C &b,float amount)
-{
-	const float one(C::ceil);
-	if(amount<0) a=~a, amount=-amount;
-
-	a.set_r(one-(one-a.get_r())*(one-b.get_r()));
-	a.set_g(one-(one-a.get_g())*(one-b.get_g()));
-	a.set_b(one-(one-a.get_b())*(one-b.get_b()));
-
-	return blendfunc_ONTO(a,b,amount);
-}
-
-template <>
-CairoColor
-blendfunc_SCREEN(CairoColor &a, CairoColor &b, float amount)
-{
-	if(amount<0) a=~a, amount=-amount;
-	
-	a.set_r(255-(255-a.get_r())*(1.0-b.get_r()/255.0));
-	a.set_g(255-(255-a.get_g())*(1.0-b.get_g()/255.0));
-	a.set_b(255-(255-a.get_b())*(1.0-b.get_b()/255.0));
-
-	return blendfunc_ONTO(a,b,amount);
-}
-
-
-template <class C>
-static C
-blendfunc_OVERLAY(C &a,C &b,float amount)
-{
-	const float one(C::ceil);
-	if(amount<0) a=~a, amount=-amount;
-
-	C rm;
-	rm.set_r(b.get_r()*a.get_r());
-	rm.set_g(b.get_g()*a.get_g());
-	rm.set_b(b.get_b()*a.get_b());
-
-	C rs;
-	rs.set_r(one-(one-a.get_r())*(one-b.get_r()));
-	rs.set_g(one-(one-a.get_g())*(one-b.get_g()));
-	rs.set_b(one-(one-a.get_b())*(one-b.get_b()));
-
-	C& ret(a);
-
-	ret.set_r(a.get_r()*rs.get_r() + (one-a.get_r())*rm.get_r());
-	ret.set_g(a.get_g()*rs.get_g() + (one-a.get_g())*rm.get_g());
-	ret.set_b(a.get_b()*rs.get_b() + (one-a.get_b())*rm.get_b());
-
-	return blendfunc_ONTO(ret,b,amount);
-}
-
-//Specialization for CairoColors
-template <>
-CairoColor
-blendfunc_OVERLAY<CairoColor>(CairoColor &a,CairoColor &b,float amount)
-{
-	if(amount<0) a=~a, amount=-amount;
-	
-	int ra, ga, ba, aa, ras, gas, bas;
-	int rb, gb, bb, ab;
-
-	ra=a.get_r();
-	ras=ra*ra;
-	ga=a.get_g();
-	gas=ga*ga;
-	ba=a.get_b();
-	bas=ba*ba;
-	aa=a.get_a();
-
-	rb=b.get_r();
-	gb=b.get_g();
-	bb=b.get_b();
-	ab=b.get_a();
-	
-	
-	int rc, gc, bc, ac;
-	
-	if(aa==0 || ab==0) return CairoColor();
-	
-	rc=(2*rb*ra+ras-2*rb*ras/255.0)/255.0;
-	gc=(2*gb*ga+gas-2*gb*gas/255.0)/255.0;
-	bc=(2*bb*ba+bas-2*bb*bas/255.0)/255.0;
-	ac=aa;
-	
-	return CairoColor::blend(CairoColor(rc, gc, bc, ac), b, amount, Color::BLEND_ONTO);
-}
-
-
-
-template <class C>
-static C
-blendfunc_HARD_LIGHT(C &a,C &b,float amount)
-{
-	const float one(C::ceil);
-	const float half((one-C::floor)/2);
-	if(amount<0) a=~a, amount=-amount;
-
-	if(a.get_r()>half)	a.set_r(one-(one-(a.get_r()*2*one-one))*(one-b.get_r()));
-	else				a.set_r(b.get_r()*(a.get_r()*2*one));
-	if(a.get_g()>half)	a.set_g(one-(one-(a.get_g()*2*one-one))*(one-b.get_g()));
-	else				a.set_g(b.get_g()*(a.get_g()*2*one));
-	if(a.get_b()>half)	a.set_b(one-(one-(a.get_b()*2*one-one))*(one-b.get_b()));
-	else				a.set_b(b.get_b()*(a.get_b()*2*one));
-
-	return blendfunc_ONTO(a,b,amount);
-}
-
-template <>
-CairoColor
-blendfunc_HARD_LIGHT(CairoColor &a, CairoColor &b, float amount)
-{
-	if(amount<0) a=~a, amount=-amount;
-	
-	int ra, ga, ba, aa;
-	int rb, gb, bb;
-	int rc, gc, bc;
-	
-	ra=a.get_r();
-	ga=a.get_g();
-	ba=a.get_b();
-	aa=a.get_a();
-	
-	rb=b.get_r();
-	gb=b.get_g();
-	bb=b.get_b();
-	
-	if(ra>127)	rc =255 -  (255-(ra*2-255))  *  (255-rb)/255.0;
-	else		rc= rb*(ra*2)/255.0;
-	if(ga>127)	gc =255 -  (255-(ga*2-255))  *  (255-gb)/255.0;
-	else		gc= gb*(ga*2)/255.0;
-	if(ba>127)	bc =255 -  (255-(ba*2-255))  *  (255-bb)/255.0;
-	else		bc= bb*(ba*2)/255.0;
-
-	return CairoColor::blend(CairoColor(rc, gc, bc, aa),b,amount, Color::BLEND_ONTO);
-//
-//	if(a.get_r()>half)	a.set_r(one-(one-(a.get_r()*2*one-one))*(one-b.get_r()));
-//	else				a.set_r(b.get_r()*(a.get_r()*2*one));
-//	if(a.get_g()>half)	a.set_g(one-(one-(a.get_g()*2*one-one))*(one-b.get_g()));
-//	else				a.set_g(b.get_g()*(a.get_g()*2*one));
-//	if(a.get_b()>half)	a.set_b(one-(one-(a.get_b()*2*one-one))*(one-b.get_b()));
-//	else				a.set_b(b.get_b()*(a.get_b()*2*one));
-//	
-//	return blendfunc_ONTO(a,b,amount);
-}
-
-template <class C>
-static C
-blendfunc_ALPHA_OVER(C &a,C &b,float amount)
-{
-	const float one(C::ceil);
-	C rm(b);
-
-	//multiply the inverse alpha channel with the one below us
-	rm.set_a((one-a.get_a())*b.get_a());
-
-	return blendfunc_STRAIGHT(rm,b,amount);
-}
-
-template <>
-CairoColor
-blendfunc_ALPHA_OVER(CairoColor &a, CairoColor &b, float amount)
-{
-	CairoColor rm(b);
-	
-	//multiply the inverse alpha channel with the one below us
-	rm.set_a((255-a.get_a())*b.get_a()/255.0);
-	
-	return CairoColor::blend(rm,b,amount, Color::BLEND_STRAIGHT);
-}
-
-
-Color
-Color::blend(Color a, Color b,float amount, Color::BlendMethod type)
-{
-	// No matter what blend method is being used,
-	// if the amount is equal to zero, then only B
-	// will shine through
-	if(fabsf(amount)<=COLOR_EPSILON)return b;
-
-	assert(type<BLEND_END);
-
-	const static blendfunc vtable[BLEND_END]=
-	{
-		blendfunc_COMPOSITE<Color>,	// 0
-		blendfunc_STRAIGHT<Color>,
-		blendfunc_BRIGHTEN<Color>,
-		blendfunc_DARKEN<Color>,
-		blendfunc_ADD<Color>,
-		blendfunc_SUBTRACT<Color>,		// 5
-		blendfunc_MULTIPLY<Color>,
-		blendfunc_DIVIDE<Color>,
-		blendfunc_COLOR<Color>,
-		blendfunc_HUE<Color>,
-		blendfunc_SATURATION<Color>,	// 10
-		blendfunc_LUMINANCE<Color>,
-		blendfunc_BEHIND<Color>,
-		blendfunc_ONTO<Color>,
-		blendfunc_ALPHA_BRIGHTEN<Color>,
-		blendfunc_ALPHA_DARKEN<Color>,	// 15
-		blendfunc_SCREEN<Color>,
-		blendfunc_HARD_LIGHT<Color>,
-		blendfunc_DIFFERENCE<Color>,
-		blendfunc_ALPHA_OVER<Color>,
-		blendfunc_OVERLAY<Color>,		// 20
-		blendfunc_STRAIGHT_ONTO<Color>,
-	};
-
-	return vtable[type](a,b,amount);
-}
-
-
-CairoColor
-CairoColor::blend(CairoColor a, CairoColor b, float amount, Color::BlendMethod type)
-{
-	// No matter what blend method is being used,
-	// if the amount is equal to zero, then only B
-	// will shine through
-	if(fabsf(amount)<=COLOR_EPSILON)return b;
-
-	assert(type<Color::BLEND_END);
-
-	const static cairoblendfunc vtable[Color::BLEND_END]=
-	{
-		blendfunc_COMPOSITE<CairoColor>,	// 0
-		blendfunc_STRAIGHT<CairoColor>,
-		blendfunc_BRIGHTEN<CairoColor>,
-		blendfunc_DARKEN<CairoColor>,
-		blendfunc_ADD<CairoColor>,
-		blendfunc_SUBTRACT<CairoColor>,		// 5
-		blendfunc_MULTIPLY<CairoColor>,
-		blendfunc_DIVIDE<CairoColor>,
-		blendfunc_COLOR<CairoColor>,
-		blendfunc_HUE<CairoColor>,
-		blendfunc_SATURATION<CairoColor>,	// 10
-		blendfunc_LUMINANCE<CairoColor>,
-		blendfunc_BEHIND<CairoColor>,
-		blendfunc_ONTO<CairoColor>,
-		blendfunc_ALPHA_BRIGHTEN<CairoColor>,
-		blendfunc_ALPHA_DARKEN<CairoColor>,	// 15
-		blendfunc_SCREEN<CairoColor>,
-		blendfunc_HARD_LIGHT<CairoColor>,
-		blendfunc_DIFFERENCE<CairoColor>,
-		blendfunc_ALPHA_OVER<CairoColor>,
-		blendfunc_OVERLAY<CairoColor>,		// 20
-		blendfunc_STRAIGHT_ONTO<CairoColor>,
-	};
-
-	return vtable[type](a,b,amount);
-}
diff --git a/src/synfig/color.h b/src/synfig/color.h
index 15f9046..fa57481 100644
--- a/src/synfig/color.h
+++ b/src/synfig/color.h
@@ -1,6 +1,6 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file color.h
-**	\brief Color Class Implementation
+**	\brief Color Classes
 **
 **	$Id$
 **
@@ -8,6 +8,7 @@
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **	Copyright (c) 2007, 2008 Chris Moore
 **	Copyright (c) 2012-2013 Carlos López
+**	Copyright (c) 2015 Diego Barrios Romero
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -22,1378 +23,55 @@
 */
 /* ========================================================================= */
 
-/* === S T A R T =========================================================== */
-
 #ifndef __SYNFIG_COLOR_H
 #define __SYNFIG_COLOR_H
 
 /* === H E A D E R S ======================================================= */
 
-
-#include <cmath>
-#include <cassert>
-#include <stdint.h>
-
-#include "gamma.h"
-#include <synfig/string.h>
-# include "angle.h"
-
-
-#ifdef USE_HALF_TYPE
-#include <OpenEXR/half.h>
-#endif
-
-/* === M A C R O S ========================================================= */
-
-#define use_colorspace_gamma()	App::use_colorspace_gamma
-#define colorspace_gamma()		(2.2f)
-#define gamma_in(x)				((x>=0) ? pow((float)x,1.0f/colorspace_gamma()) : -pow((float)-x,1.0f/colorspace_gamma()))
-#define gamma_out(x)			((x>=0) ? pow((float)x,     colorspace_gamma()) : -pow((float)-x,     colorspace_gamma()))
-
-// For some reason isnan() isn't working on macosx any more.
-// This is a quick fix.
-#if defined(__APPLE__) && !defined(SYNFIG_ISNAN_FIX)
-#ifdef isnan
-#undef isnan
-#endif
-inline bool isnan(double x) { return x != x; }
-inline bool isnan(float x) { return x != x; }
-#define SYNFIG_ISNAN_FIX 1
-#else
-#ifndef isnan
-#define isnan(x) (std::isnan)(x)
-#endif
-#endif
+#include <synfig/color/common.h>
+#include <synfig/color/color.h>
+#include <synfig/color/cairocolor.h>
+#include <synfig/color/cairocoloraccumulator.h>
 
 namespace synfig {
 
-#ifdef USE_HALF_TYPE
-typedef half ColorReal;
-#else
-typedef float ColorReal;
-#endif
-
-static const float EncodeYUV[3][3]=
-{
-	{ 0.299f, 0.587f, 0.114f },
-	{ -0.168736f, -0.331264f, 0.5f },
-	{ 0.5f, -0.418688f, -0.081312f }
-};
-
-static const float DecodeYUV[3][3]=
+inline Color::Color(const CairoColor& c)
 {
-	{ 1.0f, 0.0f, 1.402f },
-	{ 1.0f, -0.344136f, -0.714136f },
-	{ 1.0f, 1.772f, 0.0f }
-};
-
-/* === T Y P E D E F S ===================================================== */
-
-/* === C L A S S E S & S T R U C T S ======================================= */
-
-#ifdef USE_HALF_TYPE
-class ColorAccumulator;
-#endif
-class CairoColorAccumulator;
+	float div=1.0/((float)(CairoColor::ceil-CairoColor::floor));
+	set_r((ceil-floor)*c.get_r()*div);
+	set_g((ceil-floor)*c.get_g()*div);
+	set_b((ceil-floor)*c.get_b()*div);
+	set_a((ceil-floor)*c.get_a()*div);
+}
 
-class CairoColor;
 
-/*!	\class Color
-**	\ ARGB 128 bits Color class implementation 
-**	Future optimizations: lookup table for sqrt()?
-*/
-class Color
+inline CairoColor::CairoColor(const CairoColorAccumulator& c)
 {
-public:
-	typedef ColorReal value_type;
-
-private:
-	value_type a_, r_, g_, b_;
-
-public:
-	
-	static const value_type ceil;
-	static const value_type floor;
-	
-	const String get_string(void)const;
-
-	Color &
-	operator+=(const Color &rhs)
-	{
-		r_+=rhs.r_;
-		g_+=rhs.g_;
-		b_+=rhs.b_;
-		a_+=rhs.a_;
-		return *this;
-	}
-
-	Color &
-	operator-=(const Color &rhs)
-	{
-		r_-=rhs.r_;
-		g_-=rhs.g_;
-		b_-=rhs.b_;
-		a_-=rhs.a_;
-		return *this;
-	}
-
-	Color &
-	operator*=(const float &rhs)
-	{
-		r_*=rhs;
-		g_*=rhs;
-		b_*=rhs;
-		a_*=rhs;
-		return *this;
-	}
-
-	Color &
-	operator/=(const float &rhs)
-	{
-		const float temp(value_type(1)/rhs);
-		r_*=temp;
-		g_*=temp;
-		b_*=temp;
-		a_*=temp;
-		return *this;
-	}
-
-	Color
-	operator+(const Color &rhs)const
-	{ return Color(*this)+=rhs; }
-
-	Color
-	operator-(const Color &rhs)const
-	{ return Color(*this)-=rhs; }
-
-	Color
-	operator*(const float &rhs)const
-	{ return Color(*this)*=rhs; }
-
-	Color
-	operator/(const float &rhs)const
-	{ return Color(*this)/=rhs; }
-
-	bool
-	operator==(const Color &rhs)const
-	{ return r_==rhs.r_ && g_==rhs.g_ && b_==rhs.b_ && a_==rhs.a_; }
-
-	bool
-	operator!=(const Color &rhs)const
-	{ return r_!=rhs.r_ || g_!=rhs.g_ || b_!=rhs.b_ || a_!=rhs.a_; }
-
-	Color
-	operator-()const
-	{ return Color(-r_,-g_,-b_,-a_); }
-
-	//! Effectively 1.0-color
-	Color
-	operator~()const
-	{ return Color(1.0f-r_,1.0f-g_,1.0f-b_,a_); }
-
-	bool is_valid()const
-	{ return !isnan(r_) && !isnan(g_) && !isnan(b_) && !isnan(a_); }
-
-	Color premult_alpha() const
-	{
-		return Color (r_*a_, g_*a_, b_*a_, a_);
-	}
-
-	Color demult_alpha() const
-	{
-		if(a_)
-		{
-			const value_type inva = 1/a_;
-			return Color (r_*inva, g_*inva, b_*inva, a_);
-		}else return alpha();
-	}
-
-public:
-	// ETL/trunk/ETL/_gaussian.h does:
-	//   SR1=SR2=SR3=typename T::value_type();
-	// and expects that to give it initialized colors
-	// Otherwise the 'gaussian' blur type is random.
-	Color() :a_(0), r_(0), g_(0), b_(0) { }
-	Color(const value_type &f) :a_(f),r_(f), g_(f), b_(f) { }
-	Color(int f) :a_(f),r_(f), g_(f), b_(f) { }
-
-	/*!	\param R Red
-	**	\param G Green
-	**	\param B Blue
-	**	\param A Opacity(alpha) */
-	Color(const value_type& R, const value_type& G, const value_type& B, const value_type& A=1):
-		a_(A),
-		r_(R),
-		g_(G),
-		b_(B) { }
-
-	/*!	\param c Source for color components
-	**	\param A Opacity(alpha) */
-	Color(const Color& c, const value_type& A):
-		a_(A),
-		r_(c.r_),
-		g_(c.g_),
-		b_(c.b_) { }
+    set_a(CairoColor::clamp(c.a_*CairoColor::range));
+    set_r(CairoColor::clamp(c.r_*CairoColor::range));
+    set_g(CairoColor::clamp(c.g_*CairoColor::range));
+    set_b(CairoColor::clamp(c.b_*CairoColor::range));
+}
 
-	//!	Copy constructor
-	Color(const Color& c):
-		a_(c.a_),
-		r_(c.r_),
-		g_(c.g_),
-		b_(c.b_) { }
+}
 
-	//! Convert from CairoColor to Color
-	Color(const CairoColor& c);
-	
 #ifdef USE_HALF_TYPE
-	friend class ColorAccumulator;
-	//!	Convert constructor
-	Color(const ColorAccumulator& c);
-#endif
-
-	//!	Copy constructor
-	//Color(const Color &c) { memcpy((void*)this, (const void*)&c, sizeof(Color)); }
-
-	/*const Color &operator=(const value_type &i)
-	{
-		r_ = g_ = b_ = a_ = i;
-		return *this;
-	}*/
-	//Color& operator=(const Color &c) { memcpy((void*)this, (const void*)&c, sizeof(Color)); return *this; }
-
-	//! Returns the RED component
-	const value_type& get_r()const { return r_; }
-
-	//! Returns the GREEN component
-	const value_type& get_g()const { return g_; }
-
-	//! Returns the BLUE component
-	const value_type& get_b()const { return b_; }
-
-	//! Returns the amount of opacity (alpha)
-	const value_type& get_a()const { return a_; }
-
-	//! Synonym for get_a(). \see get_a()
-	const value_type& get_alpha()const { return get_a(); }
-
-	//! Converts a 2 character hex string \a s (00-ff) into a ColorReal (0.0-1.0)
-	static ColorReal hex2real(String s);
-
-	//! Converts a ColorReal \a c (0.0-1.0) into a 2 character hex string (00-ff)
-	static const String real2hex(ColorReal c);
-
-	//! Returns the color as a 6 character hex sting
-	const String get_hex()const { return String(real2hex(r_)+real2hex(g_)+real2hex(b_)); }
-
-	//! Sets the color's R, G, and B from a 3 or 6 character hex string
-	void set_hex(String& hex);
-
-	//! Sets the RED component to \a x
-	Color& set_r(const value_type& x) { r_ = x; return *this; }
-
-	//! Sets the GREEN component to \a x
-	Color& set_g(const value_type& x) { g_ = x; return *this; }
-
-	//! Sets the BLUE component to \a x
-	Color& set_b(const value_type& x) { b_ = x; return *this; }
-
-	//! Sets the opacity (alpha) to \a x
-	Color& set_a(const value_type& x) { a_ = x; return *this; }
-
-	//! Synonym for set_a(). \see set_a()
-	Color& set_alpha(const value_type& x) { return set_a(x); }
-
-	//! Returns color's luminance
-	float
-	get_y() const
-	{
-		return
-			(float)get_r()*EncodeYUV[0][0]+
-			(float)get_g()*EncodeYUV[0][1]+
-			(float)get_b()*EncodeYUV[0][2];
-	}
-
-
-	//! Returns U component of chromanance
-	float
-	get_u() const
-	{
-		return
-			(float)get_r()*EncodeYUV[1][0]+
-			(float)get_g()*EncodeYUV[1][1]+
-			(float)get_b()*EncodeYUV[1][2];
-	}
-
-
-	//! Returns V component of chromanance
-	float
-	get_v() const
-	{
-		return
-			(float)get_r()*EncodeYUV[2][0]+
-			(float)get_g()*EncodeYUV[2][1]+
-			(float)get_b()*EncodeYUV[2][2];
-	}
-
-	//! Returns the color's saturation
-	/*!	This is is the magnitude of the U and V components.
-	**	\see set_s() */
-	float
-	get_s() const
-	{
-		const float u(get_u()), v(get_v());
-		return sqrt(u*u+v*v);
-	}
-
-	//! Sets the luminance (\a y) and chromanance (\a u and \a v)
-	Color&
-	set_yuv(const float &y, const float &u, const float &v)
-	{
-		set_r(y*DecodeYUV[0][0]+u*DecodeYUV[0][1]+v*DecodeYUV[0][2]);
-		set_g(y*DecodeYUV[1][0]+u*DecodeYUV[1][1]+v*DecodeYUV[1][2]);
-		set_b(y*DecodeYUV[2][0]+u*DecodeYUV[2][1]+v*DecodeYUV[2][2]);
-		return *this;
-	}
-
-	//! Sets color luminance
-	Color& set_y(const float &y) { return set_yuv(y,get_u(),get_v()); }
-
-	//! Set U component of chromanance
-	Color& set_u(const float &u) { return set_yuv(get_y(),u,get_v()); }
-
-	//! Set V component of chromanance
-	Color& set_v(const float &v) { return set_yuv(get_y(),get_u(),v); }
-
-	//! Set the U and V components of chromanance
-	Color& set_uv(const float& u, const float& v) { return set_yuv(get_y(),u,v); }
-
-	//! Sets the color's saturation
-	/*!	\see get_s() */
-	Color&
-	set_s(const float &x)
-	{
-		float u(get_u()), v(get_v());
-		const float s(sqrt(u*u+v*v));
-		if(s)
-		{
-			u=(u/s)*x;
-			v=(v/s)*x;
-			return set_uv(u,v);
-		}
-		return *this;
-	}
-
-	//! YUV Color constructor
-	static Color YUV(const float& y, const float& u, const float& v, const value_type& a=1)
-		{ return Color().set_yuv(y,u,v).set_a(a); }
-
-	//! Returns the hue of the chromanance
-	/*!	This is the angle of the U and V components.
-	**	\see set_hue() */
-	Angle
-	get_hue() const
-		{ return Angle::tan(get_u(),get_v()); }
-
-	//! Synonym for get_hue(). \see get_hue()
-	Angle get_uv_angle() const { return get_hue(); }
-
-	//! Sets the color's hue
-	/*!	\see get_hue() */
-	Color&
-	set_hue(const Angle& theta)
-	{
-		const float s(get_s());
-		const float
-			u(s*(float)Angle::sin(theta).get()),
-			v(s*(float)Angle::cos(theta).get());
-		return set_uv(u,v);
-	}
-
-	//! Synonym for set_hue(). \see set_hue()
-	Color& set_uv_angle(const Angle& theta) { return set_hue(theta); }
-
-	//! Rotates the chromanance vector by amount specified by \a theta
-	Color& rotate_uv(const Angle& theta)
-	{
-		const float	a(Angle::sin(theta).get()),	b(Angle::cos(theta).get());
-		const float	u(get_u()),	v(get_v());
-
-		return set_uv(b*u-a*v,a*u+b*v);
-	}
-
-	//! Sets the luminance (\a y) and chromanance (\a s and \a theta).
-	/*!	\param y Luminance
-	**	\param s Saturation
-	**	\param theta Hue */
-	Color& set_yuv(const float& y, const float& s, const Angle& theta)
-	{
-		return
-			set_yuv(
-				y,
-				s*(float)Angle::sin(theta).get(),
-				s*(float)Angle::cos(theta).get()
-			);
-	}
-
-	//! YUV color constructor where the chroma is in the saturation/hue form.
-	/*!	\param y Luminance
-	**	\param s Saturation
-	**	\param theta Hue
-	**	\param a Opacity (alpha) */
-	static Color YUV(const float& y, const float& s, const Angle& theta, const value_type& a=1)
-		{ return Color().set_yuv(y,s,theta).set_a(a); }
-
-
-	//! Clamps a color so that its values are in range. Ignores attempting to visualize negative colors.
-	Color clamped()const;
-
-	//! Clamps a color so that its values are in range.
-	Color clamped_negative()const;
-
-	/* Preset Colors */
-
-	//! Preset Color Constructors
-	//@{
-#ifdef HAS_VIMAGE
-	static inline Color alpha() { return Color(0,0,0,0.0000001f); }
-#else
-	static inline Color alpha() { return Color(0,0,0,0); }
-#endif
-	static inline Color black() { return Color(0,0,0); }
-	static inline Color white() { return Color(1,1,1); }
-	static inline Color gray() { return Color(0.5f,0.5f,0.5f); }
-	static inline Color magenta() { return Color(1,0,1); }
-	static inline Color red() { return Color(1,0,0); }
-	static inline Color green() { return Color(0,1,0); }
-	static inline Color blue() { return Color(0,0,1); }
-	static inline Color cyan() { return Color(0,1,1); }
-	static inline Color yellow() { return Color(1,1,0); }
-	//@}
-
-	//! \writeme
-	enum BlendMethod
-	{
-		BLEND_COMPOSITE=0,			//!< Color A is composited onto B (Taking A's alpha into account)
-		BLEND_STRAIGHT=1,			//!< Straight linear interpolation from A->B (Alpha ignored)
-		BLEND_ONTO=13,				//!< Similar to BLEND_COMPOSITE, except that B's alpha is maintained
-		BLEND_STRAIGHT_ONTO=21,		//!< \deprecated \writeme
-		BLEND_BEHIND=12,			//!< Similar to BLEND_COMPOSITE, except that B is composited onto A.
-		BLEND_SCREEN=16,			//!< \writeme
-		BLEND_OVERLAY=20,			//!< \writeme
-		BLEND_HARD_LIGHT=17,		//!< \writeme
-		BLEND_MULTIPLY=6,			//!< Simple A*B.
-		BLEND_DIVIDE=7,				//!< Simple B/A
-		BLEND_ADD=4,				//!< Simple A+B.
-		BLEND_SUBTRACT=5,			//!< Simple A-B.
-		BLEND_DIFFERENCE=18,		//!< Simple |A-B|.
-		BLEND_BRIGHTEN=2,			//!< If composite is brighter than B, use composite. B otherwise.
-		BLEND_DARKEN=3,				//!< If composite is darker than B, use composite. B otherwise.
-		BLEND_COLOR=8,				//!< Preserves the U and V channels of color A
-		BLEND_HUE=9,				//!< Preserves the angle of the UV vector of color A
-		BLEND_SATURATION=10,		//!< Preserves the magnitude of the UV Vector of color A
-		BLEND_LUMINANCE=11,			//!< Preserves the Y channel of color A
-
-		BLEND_ALPHA_BRIGHTEN=14,	//!< \deprecated If A is less opaque than B, use A
-		BLEND_ALPHA_DARKEN=15,		//!< \deprecated If A is more opaque than B, use B
-		BLEND_ALPHA_OVER=19,		//!< \deprecated multiply alphas and then straight blends using the amount
-
-		BLEND_END=22,				//!< \internal
-		BLEND_BY_LAYER=999			//! Used to let the layer decides what Blend Method use by
-									//! default when the layer is created
-	};
-
-	/* Other */
-	static Color blend(Color a, Color b,float amount,BlendMethod type=BLEND_COMPOSITE);
-
-	static bool is_onto(BlendMethod x)
-	{
-		return x==BLEND_BRIGHTEN
-			|| x==BLEND_DARKEN
-			|| x==BLEND_ADD
-			|| x==BLEND_SUBTRACT
-			|| x==BLEND_MULTIPLY
-			|| x==BLEND_DIVIDE
-			|| x==BLEND_COLOR
-			|| x==BLEND_HUE
-			|| x==BLEND_SATURATION
-			|| x==BLEND_LUMINANCE
-			|| x==BLEND_ONTO
-			|| x==BLEND_STRAIGHT_ONTO
-			|| x==BLEND_SCREEN
-			|| x==BLEND_OVERLAY
-			|| x==BLEND_DIFFERENCE
-			|| x==BLEND_HARD_LIGHT
-		;
-	}
-
-	//! a blending method is considered 'straight' if transparent pixels in the upper layer can affect the result of the blend
-	static bool is_straight(BlendMethod x)
-	{
-		return x==BLEND_STRAIGHT
-			|| x==BLEND_STRAIGHT_ONTO
-			|| x==BLEND_ALPHA_BRIGHTEN
-		;
-	}
-/*protected:
-
-	value_type& operator[](const int i)
-	{
-		assert(i>=0);
-		assert(i<(signed)(sizeof(Color)/sizeof(value_type)));
-		return (&r_)[i];
-	}
+#include <synfig/color/coloraccumulator.h>
 
-	const value_type& operator[](const int i)const
-	{
-		assert(i>=0);
-		assert(i<(signed)(sizeof(Color)/sizeof(value_type)));
-		return (&r_)[i];
-	}
-*/
-}; // END of class Color
-
-	
-/*!  \class CairoColor
-** \ ARGB 32 bits Color class implementation
-** \ for Cairo Image usage.
-** \ Color channels are stored in a 32 bits value native endian aligened
-** \ with this order A, R, G, B
-** \ Operations over color channels
-** \ that overflow or underflow the unsigned char value
-** \ (get the value out of 0-255) aren't allowed and the
-** \ value will remain at 0 or 255. Otherwise, there could
-** \ be color cycling what will produce artifacts, since 
-** \ values outside 0-255 aren't allowed.
-** 
-** \ In this class color channels aren't alpha premultiplied
-** \ When used on a alpha premultiplied surface the premultiplication
-** \ and demultiplication has to be explicitly done by the user before 
-** \ and after being used on the Cairo Image surface.
-*/
-class CairoColor
-{
-public:
-	typedef uint32_t value_type;
-
-private:
-	value_type pixel;
-
-public:
-	static const unsigned char ceil=255;	
-	static const unsigned char floor=0;
-	static const float range;
-	static const value_type amask=0xFF<<24;
-	static const value_type rmask=0xFF<<16;
-	static const value_type gmask=0xFF<<8;
-	static const value_type bmask=0xFF;
-
-	// Operators
-public:
-	inline unsigned char ceil_clamp(int x)
-	{
-		if(x>ceil) return ceil;
-		else return (unsigned char)(x);
-	}
-	inline unsigned char floor_clamp(int x)
-	{
-		if(x<floor) return floor;
-		else return (unsigned char)(x);
-	}
-	inline unsigned char clamp(int x)
-	{
-		if(x > ceil) return ceil;
-		else if (x < floor) return floor;
-		else return (unsigned char)(x);
-	}
-	inline unsigned char clamp(float x)
-	{
-		return clamp((int) (x));
-	}
-
-	CairoColor&
-	operator+=(const CairoColor &rhs)
-	{		
-		set_r(ceil_clamp((int)(get_r()) + rhs.get_r()));
-		set_g(ceil_clamp((int)(get_g()) + rhs.get_g()));
-		set_b(ceil_clamp((int)(get_b()) + rhs.get_b()));
-		set_a(ceil_clamp((int)(get_a()) + rhs.get_a()));
-		return *this;
-	}
-
-	CairoColor&
-	operator-=(const CairoColor &rhs)
-	{		
-		set_r(floor_clamp((int)(get_r()) - rhs.get_r()));
-		set_g(floor_clamp((int)(get_g()) - rhs.get_g()));
-		set_b(floor_clamp((int)(get_b()) - rhs.get_b()));
-		set_a(floor_clamp((int)(get_a()) - rhs.get_a()));
-		return *this;
-	}
-	
-	CairoColor &
-	operator*=(const float &rhs)
-	{
-		set_r(clamp(get_r()*rhs));
-		set_g(clamp(get_g()*rhs));
-		set_b(clamp(get_b()*rhs));
-		set_a(clamp(get_a()*rhs));
-		return *this;
-	}
-
-	CairoColor &
-	operator/=(const float &rhs)
-	{
-		const float temp(1.0f/rhs);
-		set_r(clamp(get_r()*temp));
-		set_g(clamp(get_g()*temp));
-		set_b(clamp(get_b()*temp));
-		set_a(clamp(get_a()*temp));
-		return *this;
-	}
-
-	CairoColor
-	operator+(const CairoColor &rhs)const
-	{ return CairoColor(*this)+=rhs; }
-	
-	CairoColor
-	operator-(const CairoColor &rhs)const
-	{ return CairoColor(*this)-=rhs; }
-	
-	CairoColor
-	operator*(const float &rhs)const
-	{ return CairoColor(*this)*=rhs; }
-	
-	CairoColor
-	operator/(const float &rhs)const
-	{ return CairoColor(*this)/=rhs; }
-	
-	bool
-	operator==(const CairoColor &rhs)const
-	{ return get_r()==rhs.get_r()
-          && get_g()==rhs.get_g()
-		  && get_b()==rhs.get_b()
-		  && get_a()==rhs.get_a(); }
-	
-	bool
-	operator!=(const CairoColor &rhs)const
-	{ return get_r()!=rhs.get_r()
-		  || get_g()!=rhs.get_g()
-		  || get_b()!=rhs.get_b()
-		  || get_a()!=rhs.get_a(); }
-
-// Not suitable for CairoColor
-//	operator-()const
-//	{ return CairoColor(-r_,-g_,-b_,-a_); }
-
-	CairoColor
-	operator~()const
-	{ return CairoColor((unsigned char)(ceil-get_r()),(unsigned char)(ceil-get_g()),(unsigned char)(ceil-get_b()),get_a()); }
-
-	bool is_valid()const
-	{ return true; }
-
-	
-	CairoColor premult_alpha() const
-	{
-		const float a(get_a()/range);
-		return CairoColor (get_r()*a, get_g()*a, get_b()*a, get_a());
-	}
-	
-	CairoColor demult_alpha() const
-	{
-		if(get_a())
-		{
-			const float inva = range/get_a();
-			return CairoColor (get_r()*inva, get_g()*inva, get_b()*inva, get_a());
-		}else return alpha();
-	}
-
-	// Constructors
-public:
-	CairoColor() :pixel(0x0) { }
-	CairoColor(const unsigned char u): pixel((u<<24)|(u<<16)|(u<<8)|(u)) { }
-	//CairoColor(int f) :a_(f),r_(f), g_(f), b_(f) { }
-	CairoColor(const unsigned char R, const unsigned char G, const unsigned char B, const unsigned char A=ceil):
-	pixel((A<<24)|(R<<16)|(G<<8)|(B)) { }
-	CairoColor(const CairoColor& c, const unsigned char A):
-	pixel(c.get_pixel()) { set_a(A); }
-	CairoColor(const CairoColor& c): pixel(c.get_pixel()) { }
-	// Conversor constructor
-	CairoColor(const Color& c)
-	{
-		set_r((ceil-floor)*c.get_r()/(Color::ceil-Color::floor));
-		set_g((ceil-floor)*c.get_g()/(Color::ceil-Color::floor));
-		set_b((ceil-floor)*c.get_b()/(Color::ceil-Color::floor));
-		set_a((ceil-floor)*c.get_a()/(Color::ceil-Color::floor));
-	}
-	// From CairoColorAccumulator
-	friend class CairoColorAccumulator;
-	CairoColor(const CairoColorAccumulator& c);
-	CairoColor(int r, int g, int b, int a);
-	
-	value_type get_pixel()const {return pixel; }
-	unsigned char get_a()const { return pixel>>24; }
-	unsigned char get_r()const { return pixel>>16; }
-	unsigned char get_g()const { return pixel>>8; }
-	unsigned char get_b()const { return pixel; }
-	unsigned char get_alpha()const { return get_a(); }
-	
-	const String get_string(void)const;
-
-	static const String char2hex(unsigned char c);
-	static unsigned char hex2char(String s);
-	
-	void set_hex( String& str);
-	const String get_hex()const { return String(char2hex(get_r())+char2hex(get_g())+char2hex(get_b())); }
-
-	CairoColor& set_r(const unsigned char x) {pixel &= ~rmask; pixel |=(x<<16); return *this; }
-	CairoColor& set_g(const unsigned char x) {pixel &= ~gmask; pixel |=(x<<8 ); return *this; }
-	CairoColor& set_b(const unsigned char x) {pixel &= ~bmask; pixel |=(x    ); return *this; }
-	CairoColor& set_a(const unsigned char x) {pixel &= ~amask; pixel |=(x<<24); return *this; }
-	CairoColor& set_alpha(const unsigned char x) { return set_a(x); }
-	
-	float
-	get_y() const
-	{
-		return(
-		(float)get_r()*EncodeYUV[0][0]+
-		(float)get_g()*EncodeYUV[0][1]+
-		(float)get_b()*EncodeYUV[0][2]
-		)/CairoColor::range;
-	}
-
-	float
-	get_u() const
-	{
-		return(
-		(float)get_r()*EncodeYUV[1][0]+
-		(float)get_g()*EncodeYUV[1][1]+
-		(float)get_b()*EncodeYUV[1][2]
-		)/CairoColor::range;
-	}
-
-	float
-	get_v() const
-	{
-		return(
-		(float)get_r()*EncodeYUV[2][0]+
-		(float)get_g()*EncodeYUV[2][1]+
-		(float)get_b()*EncodeYUV[2][2]
-		)/CairoColor::range;
-	}
-
-	float
-	get_s() const
-	{
-		const float u(get_u()), v(get_v());
-		return sqrt(u*u+v*v);
-	}
-	
-	CairoColor&
-	set_yuv(const float &y, const float &u, const float &v)
-	{
-		Color c(*this);
-		c.set_r(y*DecodeYUV[0][0]+u*DecodeYUV[0][1]+v*DecodeYUV[0][2]);
-		c.set_g(y*DecodeYUV[1][0]+u*DecodeYUV[1][1]+v*DecodeYUV[1][2]);
-		c.set_b(y*DecodeYUV[2][0]+u*DecodeYUV[2][1]+v*DecodeYUV[2][2]);
-		(*this)=CairoColor(c);
-		return *this;
-	}
-	
-	CairoColor& set_y(const float &y) { return set_yuv(y,get_u(),get_v()); }
-	
-	CairoColor& set_u(const float &u) { return set_yuv(get_y(),u,get_v()); }
-	
-	CairoColor& set_v(const float &v) { return set_yuv(get_y(),get_u(),v); }
-	
-	CairoColor& set_uv(const float& u, const float& v) { return set_yuv(get_y(),u,v); }
-	
-	CairoColor&	set_s(const float &x)
-	{
-		float u(get_u()), v(get_v());
-		const float s(sqrt(u*u+v*v));
-		if(s)
-		{
-			u=(u/s)*x;
-			v=(v/s)*x;
-			return set_uv(u,v);
-		}
-		return *this;
-	}
-
-	static CairoColor YUV(const float& y, const float& u, const float& v, const unsigned char a=ceil)
-	{ return CairoColor().set_yuv(y,u,v).set_a(a); }
-	
-	Angle get_hue() const	{ return Angle::tan(get_u(),get_v()); }
-	
-	Angle get_uv_angle() const { return get_hue(); }
-	
-	CairoColor& set_hue(const Angle& theta)
-	{
-		const float s(get_s());
-		const float
-		u(s*(float)Angle::sin(theta).get()),
-		v(s*(float)Angle::cos(theta).get());
-		return set_uv(u,v);
-	}
-	
-	CairoColor& set_uv_angle(const Angle& theta) { return set_hue(theta); }
-	
-	CairoColor& rotate_uv(const Angle& theta)
-	{
-		const float	a(Angle::sin(theta).get()),	b(Angle::cos(theta).get());
-		const float	u(get_u()),	v(get_v());
-		return set_uv(b*u-a*v,a*u+b*v);
-	}
-
-	CairoColor& set_yuv(const float& y, const float& s, const Angle& theta)
-	{
-		return
-		set_yuv(
-				y,
-				s*(float)Angle::sin(theta).get(),
-				s*(float)Angle::cos(theta).get()
-				);
-	}
-	
-	static CairoColor YUV(const float& y, const float& s, const Angle& theta, const unsigned char a=ceil)
-	{ return CairoColor().set_yuv(y,s,theta).set_a(a); }
-
-	static inline CairoColor alpha() { return CairoColor(floor,floor,floor,floor); }
-	static inline CairoColor black() { return CairoColor(floor,floor,floor); }
-	static inline CairoColor white() { return CairoColor(ceil,ceil,ceil); }
-	static inline CairoColor gray() { return CairoColor(ceil/2,ceil/2,ceil/2); }
-	static inline CairoColor magenta() { return CairoColor(ceil,floor,ceil); }
-	static inline CairoColor red() { return CairoColor(ceil,floor, floor); }
-	static inline CairoColor green() { return CairoColor(floor, ceil,floor); }
-	static inline CairoColor blue() { return CairoColor(floor,floor,ceil); }
-	static inline CairoColor cyan() { return CairoColor(floor,ceil,ceil); }
-	static inline CairoColor yellow() { return CairoColor(ceil,ceil,floor); }
-
-	// Use Color::BlenMethods for the enum value
-	static CairoColor blend(CairoColor a, CairoColor b, float amount, Color::BlendMethod type=Color::BLEND_COMPOSITE);
-
-	static bool is_onto(Color::BlendMethod x)
-	{
-		return Color::is_onto(x);
-	}
-	
-	static bool is_straight(Color::BlendMethod x)
-	{
-		return Color::is_straight(x);
-	}
-	
-}; // End of CairoColor class
-
-//
-	class CairoColorAccumulator
-	{
-		friend class CairoColor;
-	public:
-		typedef float value_type;
-		
-	private:
-		value_type a_, r_, g_, b_;
-		
-	public:
-		
-		CairoColorAccumulator &
-		operator+=(const CairoColorAccumulator &rhs)
-		{
-			r_+=rhs.r_;
-			g_+=rhs.g_;
-			b_+=rhs.b_;
-			a_+=rhs.a_;
-			return *this;
-		}
-		
-		CairoColorAccumulator &
-		operator-=(const CairoColorAccumulator &rhs)
-		{
-			r_-=rhs.r_;
-			g_-=rhs.g_;
-			b_-=rhs.b_;
-			a_-=rhs.a_;
-			return *this;
-		}
-		
-		CairoColorAccumulator &
-		operator*=(const float &rhs)
-		{
-			r_*=rhs;
-			g_*=rhs;
-			b_*=rhs;
-			a_*=rhs;
-			return *this;
-		}
-		
-		CairoColorAccumulator &
-		operator/=(const float &rhs)
-		{
-			const float temp(value_type(1)/rhs);
-			r_*=temp;
-			g_*=temp;
-			b_*=temp;
-			a_*=temp;
-			return *this;
-		}
-		
-		CairoColorAccumulator
-		operator+(const CairoColorAccumulator &rhs)const
-		{ return CairoColorAccumulator(*this)+=rhs; }
-		
-		CairoColorAccumulator
-		operator-(const CairoColorAccumulator &rhs)const
-		{ return CairoColorAccumulator(*this)-=rhs; }
-		
-		CairoColorAccumulator
-		operator*(const float &rhs)const
-		{ return CairoColorAccumulator(*this)*=rhs; }
-		
-		CairoColorAccumulator
-		operator/(const float &rhs)const
-		{ return CairoColorAccumulator(*this)/=rhs; }
-		
-		bool
-		operator==(const CairoColorAccumulator &rhs)const
-		{ return r_==rhs.r_ && g_==rhs.g_ && b_==rhs.b_ && a_!=rhs.a_; }
-		
-		bool
-		operator!=(const CairoColorAccumulator &rhs)const
-		{ return r_!=rhs.r_ || g_!=rhs.g_ || b_!=rhs.b_ || a_!=rhs.a_; }
-		
-		CairoColorAccumulator
-		operator-()const
-		{ return CairoColorAccumulator(-r_,-g_,-b_,-a_); }
-		
-		bool is_valid()const
-		{ return !isnan(r_) && !isnan(g_) && !isnan(b_) && !isnan(a_); }
-		
-	public:
-		CairoColorAccumulator(): a_(), r_(), g_(), b_() { }
-		
-		/*!	\param R Red
-		 **	\param G Green
-		 **	\param B Blue
-		 **	\param A Opacity(alpha) */
-		CairoColorAccumulator(const value_type& R, const value_type& G, const value_type& B, const value_type& A=1):
-		a_(A),
-		r_(R),
-		g_(G),
-		b_(B) { }
-		
-		//!	Copy constructor
-		CairoColorAccumulator(const CairoColorAccumulator& c):
-		a_(c.a_),
-		r_(c.r_),
-		g_(c.g_),
-		b_(c.b_) { }
-		
-		//!	Converter
-		CairoColorAccumulator(const CairoColor& c):
-		a_(c.get_a()/CairoColor::range),
-		r_(c.get_r()/CairoColor::range),
-		g_(c.get_g()/CairoColor::range),
-		b_(c.get_b()/CairoColor::range) { }
-		
-		//! Converter
-		CairoColorAccumulator(int c): a_(c),r_(c), g_(c), b_(c) { }
-		
-		//! Returns the RED component
-		const value_type& get_r()const { return r_; }
-		
-		//! Returns the GREEN component
-		const value_type& get_g()const { return g_; }
-		
-		//! Returns the BLUE component
-		const value_type& get_b()const { return b_; }
-		
-		//! Returns the amount of opacity (alpha)
-		const value_type& get_a()const { return a_; }
-		
-		//! Synonym for get_a(). \see get_a()
-		const value_type& get_alpha()const { return get_a(); }
-		
-		//! Sets the RED component to \a x
-		CairoColorAccumulator& set_r(const value_type& x) { r_ = x; return *this; }
-		
-		//! Sets the GREEN component to \a x
-		CairoColorAccumulator& set_g(const value_type& x) { g_ = x; return *this; }
-		
-		//! Sets the BLUE component to \a x
-		CairoColorAccumulator& set_b(const value_type& x) { b_ = x; return *this; }
-		
-		//! Sets the opacity (alpha) to \a x
-		CairoColorAccumulator& set_a(const value_type& x) { a_ = x; return *this; }
-		
-		//! Synonym for set_a(). \see set_a()
-		CairoColorAccumulator& set_alpha(const value_type& x) { return set_a(x); }
-	};
-	
-	inline
-	CairoColor::CairoColor(const CairoColorAccumulator& c){
-	set_a(CairoColor::clamp(c.a_*CairoColor::range));
-	set_r(CairoColor::clamp(c.r_*CairoColor::range));
-	set_g(CairoColor::clamp(c.g_*CairoColor::range));
-	set_b(CairoColor::clamp(c.b_*CairoColor::range));
-	}
-	inline
-	CairoColor::CairoColor(int r, int g, int b, int a)
-	{
-		set_r(CairoColor::clamp(r));
-		set_g(CairoColor::clamp(g));
-		set_b(CairoColor::clamp(b));
-		set_a(CairoColor::clamp(a));
-	}
-
-
-//
-
-
-#ifndef USE_HALF_TYPE
-typedef Color ColorAccumulator;
-#else
-class ColorAccumulator
-{
-	friend class Color;
-public:
-	typedef float value_type;
-
-private:
-	value_type a_, r_, g_, b_;
-
-public:
-
-	ColorAccumulator &
-	operator+=(const ColorAccumulator &rhs)
-	{
-		r_+=rhs.r_;
-		g_+=rhs.g_;
-		b_+=rhs.b_;
-		a_+=rhs.a_;
-		return *this;
-	}
-
-	ColorAccumulator &
-	operator-=(const ColorAccumulator &rhs)
-	{
-		r_-=rhs.r_;
-		g_-=rhs.g_;
-		b_-=rhs.b_;
-		a_-=rhs.a_;
-		return *this;
-	}
-
-	ColorAccumulator &
-	operator*=(const float &rhs)
-	{
-		r_*=rhs;
-		g_*=rhs;
-		b_*=rhs;
-		a_*=rhs;
-		return *this;
-	}
-
-	ColorAccumulator &
-	operator/=(const float &rhs)
-	{
-		const float temp(value_type(1)/rhs);
-		r_*=temp;
-		g_*=temp;
-		b_*=temp;
-		a_*=temp;
-		return *this;
-	}
-
-	ColorAccumulator
-	operator+(const ColorAccumulator &rhs)const
-	{ return Color(*this)+=rhs; }
-
-	ColorAccumulator
-	operator-(const ColorAccumulator &rhs)const
-	{ return Color(*this)-=rhs; }
-
-	ColorAccumulator
-	operator*(const float &rhs)const
-	{ return Color(*this)*=rhs; }
-
-	ColorAccumulator
-	operator/(const float &rhs)const
-	{ return Color(*this)/=rhs; }
-
-	bool
-	operator==(const ColorAccumulator &rhs)const
-	{ return r_==rhs.r_ && g_==rhs.g_ && b_==rhs.b_ && a_!=rhs.a_; }
-
-	bool
-	operator!=(const ColorAccumulator &rhs)const
-	{ return r_!=rhs.r_ || g_!=rhs.g_ || b_!=rhs.b_ || a_!=rhs.a_; }
-
-	Color
-	operator-()const
-	{ return ColorAccumulator(-r_,-g_,-b_,-a_); }
-
-	bool is_valid()const
-	{ return !isnan(r_) && !isnan(g_) && !isnan(b_) && !isnan(a_); }
-
-public:
-	ColorAccumulator(): a_(), r_(), g_(), b_() { }
-
-	/*!	\param R Red
-	**	\param G Green
-	**	\param B Blue
-	**	\param A Opacity(alpha) */
-	ColorAccumulator(const value_type& R, const value_type& G, const value_type& B, const value_type& A=1):
-		a_(A),
-		r_(R),
-		g_(G),
-		b_(B) { }
-
-	//!	Copy constructor
-	ColorAccumulator(const ColorAccumulator& c):
-		a_(c.a_),
-		r_(c.r_),
-		g_(c.g_),
-		b_(c.b_) { }
-
-	//!	Converter
-	ColorAccumulator(const Color& c):
-		a_(c.a_),
-		r_(c.r_),
-		g_(c.g_),
-		b_(c.b_) { }
-
-	//! Converter
-	ColorAccumulator(int c): a_(c),r_(c), g_(c), b_(c) { }
-
-	//! Returns the RED component
-	const value_type& get_r()const { return r_; }
-
-	//! Returns the GREEN component
-	const value_type& get_g()const { return g_; }
-
-	//! Returns the BLUE component
-	const value_type& get_b()const { return b_; }
-
-	//! Returns the amount of opacity (alpha)
-	const value_type& get_a()const { return a_; }
-
-	//! Synonym for get_a(). \see get_a()
-	const value_type& get_alpha()const { return get_a(); }
-
-	//! Sets the RED component to \a x
-	ColorAccumulator& set_r(const value_type& x) { r_ = x; return *this; }
-
-	//! Sets the GREEN component to \a x
-	ColorAccumulator& set_g(const value_type& x) { g_ = x; return *this; }
-
-	//! Sets the BLUE component to \a x
-	ColorAccumulator& set_b(const value_type& x) { b_ = x; return *this; }
-
-	//! Sets the opacity (alpha) to \a x
-	ColorAccumulator& set_a(const value_type& x) { a_ = x; return *this; }
-
-	//! Synonym for set_a(). \see set_a()
-	ColorAccumulator& set_alpha(const value_type& x) { return set_a(x); }
-};
-
-inline
-Color::Color(const ColorAccumulator& c):
+namespace synfig {
+inline Color::Color(const ColorAccumulator& c):
 	a_(c.a_),
 	r_(c.r_),
 	g_(c.g_),
 	b_(c.b_) { }
-
-#endif
-
-
-
-
-
-enum PixelFormat
-{
-/* Bit	Descriptions (ON/OFF)
-** ----+-------------
-** 0	Color Channels (Gray/RGB)
-** 1	Alpha Channel (WITH/WITHOUT)
-** 2	ZDepth	(WITH/WITHOUT)
-** 3	Endian (BGR/RGB)
-** 4	Alpha Location (Start/End)
-** 5	ZDepth Location (Start/End)
-** 6	Alpha/ZDepth Arrangement (ZA,AZ)
-** 7	Alpha Range (Inverted,Normal)
-** 8	Z Range (Inverted,Normal)
-*/
-	PF_RGB=0,
-	PF_GRAY=(1<<0),			//!< If set, use one grayscale channel. If clear, use three channels for RGB
-	PF_A=(1<<1),			//!< If set, include alpha channel
-	PF_Z=(1<<2),			//!< If set, include ZDepth channel
-	PF_BGR=(1<<3),			//!< If set, reverse the order of the RGB channels
-	PF_A_START=(1<<4),		//!< If set, alpha channel is before the color data. If clear, it is after.
-	PF_Z_START=(1<<5),		//!< If set, ZDepth channel is before the color data. If clear, it is after.
-	PF_ZA=(1<<6),			//!< If set, the ZDepth channel will be in front of the alpha channel. If clear, they are reversed.
-
-	PF_A_INV=(1<<7),		//!< If set, the alpha channel is stored as 1.0-a
-	PF_Z_INV=(1<<8),		//!< If set, the ZDepth channel is stored as 1.0-z
-	PF_RAW_COLOR=(1<<9)+(1<<1)	//!< If set, the data represents a raw Color data structure, and all other bits are ignored.
-};
-
-inline PixelFormat operator|(PixelFormat lhs, PixelFormat rhs)
-	{ return static_cast<PixelFormat>((int)lhs|(int)rhs); }
-
-inline PixelFormat operator&(PixelFormat lhs, PixelFormat rhs)
-	{ return static_cast<PixelFormat>((int)lhs&(int)rhs); }
-#define FLAGS(x,y)		(((x)&(y))==(y))
-
-//! Returns the number of channels that the given PixelFormat calls for
-inline int
-channels(PixelFormat x)
-{
-	int chan=0;
-	if(FLAGS(x,PF_GRAY))
-		++chan;
-	else
-		chan+=3;
-	if(FLAGS(x,PF_A))
-		++chan;
-	if(FLAGS(x,PF_Z))
-		++chan;
-	if(FLAGS(x,PF_RAW_COLOR))
-		chan=sizeof(Color);
-
-	return chan;
 }
-
-inline unsigned char *
-Color2PixelFormat(const Color &color, const PixelFormat &pf, unsigned char *out, const Gamma &gamma)
-{
-	if(FLAGS(pf,PF_RAW_COLOR))
-	{
-		Color *outcol=reinterpret_cast<Color *>(out);
-		*outcol=color;
-		out+=sizeof(color);
-		return out;
-	}
-
-	int alpha=(int)((FLAGS(pf,PF_A_INV)?(-(float)color.get_a()+1):(float)color.get_a())*255);
-	if(alpha<0)alpha=0;
-	if(alpha>255)alpha=255;
-
-	if(FLAGS(pf,PF_ZA|PF_A_START|PF_Z_START))
-	{
-		if(FLAGS(pf,PF_Z_START))
-			out++;
-		if(FLAGS(pf,PF_A_START))
-			*out++=static_cast<unsigned char>(alpha);
-	}
-	else
-	{
-		if(FLAGS(pf,PF_A_START))
-			*out++=static_cast<unsigned char>(alpha);
-		if(FLAGS(pf,PF_Z_START))
-			out++;
-	}
-
-	if(FLAGS(pf,PF_GRAY))
-		*out++=static_cast<unsigned char>(gamma.g_F32_to_U8(color.get_y()));
-	else
-	{
-		if(FLAGS(pf,PF_BGR))
-		{
-			*out++=static_cast<unsigned char>(gamma.r_F32_to_U8(color.get_b()));
-			*out++=static_cast<unsigned char>(gamma.g_F32_to_U8(color.get_g()));
-			*out++=static_cast<unsigned char>(gamma.b_F32_to_U8(color.get_r()));
-		}
-		else
-		{
-			*out++=static_cast<unsigned char>(gamma.r_F32_to_U8(color.get_r()));
-			*out++=static_cast<unsigned char>(gamma.g_F32_to_U8(color.get_g()));
-			*out++=static_cast<unsigned char>(gamma.b_F32_to_U8(color.get_b()));
-		}
-	}
-
-	if(FLAGS(pf,PF_ZA))
-	{
-		if(!FLAGS(pf,PF_Z_START) && FLAGS(pf,PF_Z))
-			out++;
-		if(!FLAGS(pf,PF_A_START) && FLAGS(pf,PF_A))
-			*out++=static_cast<unsigned char>(alpha);
-	}
-	else
-	{
-		if(!FLAGS(pf,PF_Z_START) && FLAGS(pf,PF_Z))
-			out++;
-		if(!FLAGS(pf,PF_A_START) && FLAGS(pf,PF_A))
-			*out++=static_cast<unsigned char>(alpha);
-	}
-	return out;
-}
-
-inline void
-convert_color_format(unsigned char *dest, const Color *src, int w, PixelFormat pf,const Gamma &gamma)
-{
-	assert(w>=0);
-	while(w--)
-		dest=Color2PixelFormat((*(src++)).clamped(),pf,dest,gamma);
-}
-
-inline const unsigned char *
-PixelFormat2Color(Color &color, const PixelFormat &pf,const unsigned char *out)
-{
-	if(FLAGS(pf,PF_ZA|PF_A_START|PF_Z_START))
-	{
-		if(FLAGS(pf,PF_Z_START))
-			out++;
-		if(FLAGS(pf,PF_A_START))
-			color.set_a((float)*out++/255);
-	}
-	else
-	{
-		if(FLAGS(pf,PF_A_START))
-			color.set_a((float)*out++/255);
-		if(FLAGS(pf,PF_Z_START))
-			out++;
-	}
-
-	if(FLAGS(pf,PF_GRAY))
-		color.set_yuv((float)*out++/255,0,0);
-	else
-	{
-		if(FLAGS(pf,PF_BGR))
-		{
-			color.set_b((float)*out++/255);
-			color.set_g((float)*out++/255);
-			color.set_r((float)*out++/255);
-		}
-		else
-		{
-			color.set_r((float)*out++/255);
-			color.set_g((float)*out++/255);
-			color.set_b((float)*out++/255);
-		}
-	}
-
-	if(FLAGS(pf,PF_ZA))
-	{
-		if(!FLAGS(pf,PF_Z_START) && FLAGS(pf,PF_Z))
-			out++;
-		if(!FLAGS(pf,PF_A_START) && FLAGS(pf,PF_A))
-			color.set_a((float)*out++/255);
-	}
-	else
-	{
-		if(!FLAGS(pf,PF_A_START) && FLAGS(pf,PF_A))
-			color.set_a((float)*out++/255);
-		if(!FLAGS(pf,PF_Z_START) && FLAGS(pf,PF_Z))
-			out++;
-	}
-	return out;
+#else
+namespace synfig {
+typedef Color ColorAccumulator;
 }
+#endif
 
+#include <synfig/color/pixelformat.h>
 
+#endif // __SYNFIG_COLOR_H
 
-}; // END of namespace synfig
-
-/* === E N D =============================================================== */
-
-#endif
diff --git a/src/synfig/color/Makefile_insert b/src/synfig/color/Makefile_insert
new file mode 100644
index 0000000..19b5f95
--- /dev/null
+++ b/src/synfig/color/Makefile_insert
@@ -0,0 +1,21 @@
+COLOR_HH = \
+	color/color.h \
+	color/color.hpp \
+	color/coloraccumulator.h \
+	color/cairocolor.h \
+	color/cairocoloraccumulator.h \
+	color/pixelformat.h \
+	color/common.h
+
+COLOR_CC = \
+	color/color.cpp \
+	color/cairocolor.cpp
+
+libsynfig_include_HH += \
+    $(COLOR_HH)
+
+libsynfig_src += \
+    $(COLOR_HH) \
+	color/colorblendingfunctions.h \
+	color/cairocolorblendingfunctions.h \
+    $(COLOR_CC)
diff --git a/src/synfig/color/cairocolor.cpp b/src/synfig/color/cairocolor.cpp
new file mode 100644
index 0000000..6fad65c
--- /dev/null
+++ b/src/synfig/color/cairocolor.cpp
@@ -0,0 +1,128 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file
+**	\brief CairoColor class implementation
+**
+**	$Id$
+**
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 2008 Chris Moore
+**	Copyright (c) 2012-2013 Carlos López
+**	Copyright (c) 2015 Diego Barrios Romero
+**
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
+**
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
+**	\endlegal
+*/
+/* ========================================================================= */
+
+/* === H E A D E R S ======================================================= */
+
+#ifdef USING_PCH
+#	include "pch.h"
+#else
+#ifdef HAVE_CONFIG_H
+#	include <config.h>
+#endif
+
+#include <ETL/angle>
+#include "color.h"
+#include "cairocolor.h"
+#include <cstdio>
+#include <sstream>
+#include <iostream>
+#include <iomanip>
+#include "cairocolorblendingfunctions.h"
+
+#endif
+
+namespace synfig {
+
+const float CairoColor::range = CairoColor::ceil - CairoColor::floor;
+
+/* === M E T H O D S ======================================================= */
+
+unsigned char
+CairoColor::hex2char(String s)
+{
+	ColorReal cr(Color::hex2real(s));
+	return (unsigned char)(cr*255.0f);
+}
+
+
+const String
+CairoColor::char2hex(unsigned char c)
+{
+	String s(Color::real2hex((ColorReal)(c/((float)ceil))));
+	return s.c_str();
+}
+
+void 
+CairoColor::set_hex(String& str)
+{
+	CairoColor ret(*this);
+	Color c;
+	c.set_hex(str);
+	c=c.clamped();
+	ret=CairoColor(c);
+}
+
+
+const String
+CairoColor::get_string(void)const
+{
+	std::ostringstream o;
+	o << std::fixed << std::setprecision(3) << "#" << get_hex().c_str() << " : " << std::setw(6) << get_a();
+	return String(o.str().c_str());
+}
+
+CairoColor
+CairoColor::blend(CairoColor a, CairoColor b, float amount, Color::BlendMethod type)
+{
+	// No matter what blend method is being used,
+	// if the amount is equal to zero, then only B
+	// will shine through
+	if(fabsf(amount)<=COLOR_EPSILON)return b;
+
+	assert(type<Color::BLEND_END);
+
+	const static cairoblendfunc vtable[Color::BLEND_END]=
+	{
+        // WARNING: any change here must be coordinated with
+        // other specializations of the functions.
+		blendfunc_COMPOSITE<CairoColor>,	// 0
+		blendfunc_STRAIGHT<CairoColor>,
+		blendfunc_BRIGHTEN<CairoColor>,
+		blendfunc_DARKEN<CairoColor>,
+		blendfunc_ADD<CairoColor>,
+		blendfunc_SUBTRACT<CairoColor>,		// 5
+		blendfunc_MULTIPLY<CairoColor>,
+		blendfunc_DIVIDE<CairoColor>,
+		blendfunc_COLOR<CairoColor>,
+		blendfunc_HUE<CairoColor>,
+		blendfunc_SATURATION<CairoColor>,	// 10
+		blendfunc_LUMINANCE<CairoColor>,
+		blendfunc_BEHIND<CairoColor>,
+		blendfunc_ONTO<CairoColor>,
+		blendfunc_ALPHA_BRIGHTEN<CairoColor>,
+		blendfunc_ALPHA_DARKEN<CairoColor>,	// 15
+		blendfunc_SCREEN<CairoColor>,
+		blendfunc_HARD_LIGHT<CairoColor>,
+		blendfunc_DIFFERENCE<CairoColor>,
+		blendfunc_ALPHA_OVER<CairoColor>,
+		blendfunc_OVERLAY<CairoColor>,		// 20
+		blendfunc_STRAIGHT_ONTO<CairoColor>,
+	};
+
+	return vtable[type](a,b,amount);
+}
+
+} // synfig namespace
+
diff --git a/src/synfig/color/cairocolor.h b/src/synfig/color/cairocolor.h
new file mode 100644
index 0000000..87a1625
--- /dev/null
+++ b/src/synfig/color/cairocolor.h
@@ -0,0 +1,381 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file
+**	\brief CairoColor Class
+**
+**	$Id$
+**
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 2008 Chris Moore
+**	Copyright (c) 2012-2013 Carlos López
+**	Copyright (c) 2015 Diego Barrios Romero
+**
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
+**
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
+**	\endlegal
+*/
+/* ========================================================================= */
+
+#ifndef __SYNFIG_COLOR_CAIROCOLOR_H
+#define __SYNFIG_COLOR_CAIROCOLOR_H
+
+#include <synfig/color/common.h>
+
+namespace synfig {
+
+class CairoColorAccumulator;
+
+/*!  \class CairoColor
+** \ ARGB 32 bits Color class implementation
+** \ for Cairo Image usage.
+** \ Color channels are stored in a 32 bits value native endian aligened
+** \ with this order A, R, G, B
+** \ Operations over color channels
+** \ that overflow or underflow the unsigned char value
+** \ (get the value out of 0-255) aren't allowed and the
+** \ value will remain at 0 or 255. Otherwise, there could
+** \ be color cycling what will produce artifacts, since 
+** \ values outside 0-255 aren't allowed.
+** 
+** \ In this class color channels aren't alpha premultiplied
+** \ When used on a alpha premultiplied surface the premultiplication
+** \ and demultiplication has to be explicitly done by the user before 
+** \ and after being used on the Cairo Image surface.
+*/
+class CairoColor
+{
+public:
+	typedef uint32_t value_type;
+
+private:
+	value_type pixel;
+
+public:
+	static const unsigned char ceil=255;	
+	static const unsigned char floor=0;
+	static const float range;
+	static const value_type amask=0xFF<<24;
+	static const value_type rmask=0xFF<<16;
+	static const value_type gmask=0xFF<<8;
+	static const value_type bmask=0xFF;
+
+	// Operators
+public:
+	inline unsigned char ceil_clamp(int x)
+	{
+		if(x>ceil) return ceil;
+		else return (unsigned char)(x);
+	}
+	inline unsigned char floor_clamp(int x)
+	{
+		if(x<floor) return floor;
+		else return (unsigned char)(x);
+	}
+	inline unsigned char clamp(int x)
+	{
+		if(x > ceil) return ceil;
+		else if (x < floor) return floor;
+		else return (unsigned char)(x);
+	}
+	inline unsigned char clamp(float x)
+	{
+		return clamp((int) (x));
+	}
+
+	CairoColor&
+	operator+=(const CairoColor &rhs)
+	{		
+		set_r(ceil_clamp((int)(get_r()) + rhs.get_r()));
+		set_g(ceil_clamp((int)(get_g()) + rhs.get_g()));
+		set_b(ceil_clamp((int)(get_b()) + rhs.get_b()));
+		set_a(ceil_clamp((int)(get_a()) + rhs.get_a()));
+		return *this;
+	}
+
+	CairoColor&
+	operator-=(const CairoColor &rhs)
+	{		
+		set_r(floor_clamp((int)(get_r()) - rhs.get_r()));
+		set_g(floor_clamp((int)(get_g()) - rhs.get_g()));
+		set_b(floor_clamp((int)(get_b()) - rhs.get_b()));
+		set_a(floor_clamp((int)(get_a()) - rhs.get_a()));
+		return *this;
+	}
+	
+	CairoColor &
+	operator*=(const float &rhs)
+	{
+		set_r(clamp(get_r()*rhs));
+		set_g(clamp(get_g()*rhs));
+		set_b(clamp(get_b()*rhs));
+		set_a(clamp(get_a()*rhs));
+		return *this;
+	}
+
+	CairoColor &
+	operator/=(const float &rhs)
+	{
+		const float temp(1.0f/rhs);
+		set_r(clamp(get_r()*temp));
+		set_g(clamp(get_g()*temp));
+		set_b(clamp(get_b()*temp));
+		set_a(clamp(get_a()*temp));
+		return *this;
+	}
+
+	CairoColor
+	operator+(const CairoColor &rhs)const
+	{ return CairoColor(*this)+=rhs; }
+	
+	CairoColor
+	operator-(const CairoColor &rhs)const
+	{ return CairoColor(*this)-=rhs; }
+	
+	CairoColor
+	operator*(const float &rhs)const
+	{ return CairoColor(*this)*=rhs; }
+	
+	CairoColor
+	operator/(const float &rhs)const
+	{ return CairoColor(*this)/=rhs; }
+	
+	bool
+	operator==(const CairoColor &rhs)const
+	{ return get_r()==rhs.get_r()
+          && get_g()==rhs.get_g()
+		  && get_b()==rhs.get_b()
+		  && get_a()==rhs.get_a(); }
+	
+	bool
+	operator!=(const CairoColor &rhs)const
+	{ return get_r()!=rhs.get_r()
+		  || get_g()!=rhs.get_g()
+		  || get_b()!=rhs.get_b()
+		  || get_a()!=rhs.get_a(); }
+
+// Not suitable for CairoColor
+//	operator-()const
+//	{ return CairoColor(-r_,-g_,-b_,-a_); }
+
+	CairoColor
+	operator~()const
+	{ return CairoColor((unsigned char)(ceil-get_r()),(unsigned char)(ceil-get_g()),(unsigned char)(ceil-get_b()),get_a()); }
+
+	bool is_valid()const
+	{ return true; }
+
+	
+	CairoColor premult_alpha() const
+	{
+		const float a(get_a()/range);
+		return CairoColor (get_r()*a, get_g()*a, get_b()*a, get_a());
+	}
+	
+	CairoColor demult_alpha() const
+	{
+		if(get_a())
+		{
+			const float inva = range/get_a();
+			return CairoColor (get_r()*inva, get_g()*inva, get_b()*inva, get_a());
+		}else return alpha();
+	}
+
+	// Constructors
+public:
+	CairoColor() :pixel(0x0) { }
+	CairoColor(const unsigned char u): pixel((u<<24)|(u<<16)|(u<<8)|(u)) { }
+	//CairoColor(int f) :a_(f),r_(f), g_(f), b_(f) { }
+	CairoColor(const unsigned char R, const unsigned char G, const unsigned char B, const unsigned char A=ceil):
+	pixel((A<<24)|(R<<16)|(G<<8)|(B)) { }
+	CairoColor(const CairoColor& c, const unsigned char A):
+	pixel(c.get_pixel()) { set_a(A); }
+	CairoColor(const CairoColor& c): pixel(c.get_pixel()) { }
+	// Conversor constructor
+	CairoColor(const Color& c)
+	{
+		set_r((ceil-floor)*c.get_r()/(Color::ceil-Color::floor));
+		set_g((ceil-floor)*c.get_g()/(Color::ceil-Color::floor));
+		set_b((ceil-floor)*c.get_b()/(Color::ceil-Color::floor));
+		set_a((ceil-floor)*c.get_a()/(Color::ceil-Color::floor));
+	}
+	// From CairoColorAccumulator
+	friend class CairoColorAccumulator;
+	inline CairoColor(const CairoColorAccumulator& c);
+	CairoColor(int r, int g, int b, int a);
+	
+	value_type get_pixel()const {return pixel; }
+	unsigned char get_a()const { return pixel>>24; }
+	unsigned char get_r()const { return pixel>>16; }
+	unsigned char get_g()const { return pixel>>8; }
+	unsigned char get_b()const { return pixel; }
+	unsigned char get_alpha()const { return get_a(); }
+	
+	const String get_string(void)const;
+
+	static const String char2hex(unsigned char c);
+	static unsigned char hex2char(String s);
+	
+	void set_hex( String& str);
+	const String get_hex()const { return String(char2hex(get_r())+char2hex(get_g())+char2hex(get_b())); }
+
+	CairoColor& set_r(const unsigned char x) {pixel &= ~rmask; pixel |=(x<<16); return *this; }
+	CairoColor& set_g(const unsigned char x) {pixel &= ~gmask; pixel |=(x<<8 ); return *this; }
+	CairoColor& set_b(const unsigned char x) {pixel &= ~bmask; pixel |=(x    ); return *this; }
+	CairoColor& set_a(const unsigned char x) {pixel &= ~amask; pixel |=(x<<24); return *this; }
+	CairoColor& set_alpha(const unsigned char x) { return set_a(x); }
+	
+	float
+	get_y() const
+	{
+		return(
+		(float)get_r()*EncodeYUV[0][0]+
+		(float)get_g()*EncodeYUV[0][1]+
+		(float)get_b()*EncodeYUV[0][2]
+		)/CairoColor::range;
+	}
+
+	float
+	get_u() const
+	{
+		return(
+		(float)get_r()*EncodeYUV[1][0]+
+		(float)get_g()*EncodeYUV[1][1]+
+		(float)get_b()*EncodeYUV[1][2]
+		)/CairoColor::range;
+	}
+
+	float
+	get_v() const
+	{
+		return(
+		(float)get_r()*EncodeYUV[2][0]+
+		(float)get_g()*EncodeYUV[2][1]+
+		(float)get_b()*EncodeYUV[2][2]
+		)/CairoColor::range;
+	}
+
+	float
+	get_s() const
+	{
+		const float u(get_u()), v(get_v());
+		return sqrt(u*u+v*v);
+	}
+	
+	CairoColor&
+	set_yuv(const float &y, const float &u, const float &v)
+	{
+		Color c(*this);
+		c.set_r(y*DecodeYUV[0][0]+u*DecodeYUV[0][1]+v*DecodeYUV[0][2]);
+		c.set_g(y*DecodeYUV[1][0]+u*DecodeYUV[1][1]+v*DecodeYUV[1][2]);
+		c.set_b(y*DecodeYUV[2][0]+u*DecodeYUV[2][1]+v*DecodeYUV[2][2]);
+		(*this)=CairoColor(c);
+		return *this;
+	}
+	
+	CairoColor& set_y(const float &y) { return set_yuv(y,get_u(),get_v()); }
+	
+	CairoColor& set_u(const float &u) { return set_yuv(get_y(),u,get_v()); }
+	
+	CairoColor& set_v(const float &v) { return set_yuv(get_y(),get_u(),v); }
+	
+	CairoColor& set_uv(const float& u, const float& v) { return set_yuv(get_y(),u,v); }
+	
+	CairoColor&	set_s(const float &x)
+	{
+		float u(get_u()), v(get_v());
+		const float s(sqrt(u*u+v*v));
+		if(s)
+		{
+			u=(u/s)*x;
+			v=(v/s)*x;
+			return set_uv(u,v);
+		}
+		return *this;
+	}
+
+	static CairoColor YUV(const float& y, const float& u, const float& v, const unsigned char a=ceil)
+	{ return CairoColor().set_yuv(y,u,v).set_a(a); }
+	
+	Angle get_hue() const	{ return Angle::tan(get_u(),get_v()); }
+	
+	Angle get_uv_angle() const { return get_hue(); }
+	
+	CairoColor& set_hue(const Angle& theta)
+	{
+		const float s(get_s());
+		const float
+		u(s*(float)Angle::sin(theta).get()),
+		v(s*(float)Angle::cos(theta).get());
+		return set_uv(u,v);
+	}
+	
+	CairoColor& set_uv_angle(const Angle& theta) { return set_hue(theta); }
+	
+	CairoColor& rotate_uv(const Angle& theta)
+	{
+		const float	a(Angle::sin(theta).get()),	b(Angle::cos(theta).get());
+		const float	u(get_u()),	v(get_v());
+		return set_uv(b*u-a*v,a*u+b*v);
+	}
+
+	CairoColor& set_yuv(const float& y, const float& s, const Angle& theta)
+	{
+		return
+		set_yuv(
+				y,
+				s*(float)Angle::sin(theta).get(),
+				s*(float)Angle::cos(theta).get()
+				);
+	}
+	
+	static CairoColor YUV(const float& y, const float& s, const Angle& theta, const unsigned char a=ceil)
+	{ return CairoColor().set_yuv(y,s,theta).set_a(a); }
+
+	static inline CairoColor alpha() { return CairoColor(floor,floor,floor,floor); }
+	static inline CairoColor black() { return CairoColor(floor,floor,floor); }
+	static inline CairoColor white() { return CairoColor(ceil,ceil,ceil); }
+	static inline CairoColor gray() { return CairoColor(ceil/2,ceil/2,ceil/2); }
+	static inline CairoColor magenta() { return CairoColor(ceil,floor,ceil); }
+	static inline CairoColor red() { return CairoColor(ceil,floor, floor); }
+	static inline CairoColor green() { return CairoColor(floor, ceil,floor); }
+	static inline CairoColor blue() { return CairoColor(floor,floor,ceil); }
+	static inline CairoColor cyan() { return CairoColor(floor,ceil,ceil); }
+	static inline CairoColor yellow() { return CairoColor(ceil,ceil,floor); }
+
+	// Use Color::BlenMethods for the enum value
+	static CairoColor blend(CairoColor a, CairoColor b, float amount, Color::BlendMethod type=Color::BLEND_COMPOSITE);
+
+	static bool is_onto(Color::BlendMethod x)
+	{
+		return Color::is_onto(x);
+	}
+	
+	static bool is_straight(Color::BlendMethod x)
+	{
+		return Color::is_straight(x);
+	}
+	
+}; // End of CairoColor class
+
+
+inline CairoColor::CairoColor(int r, int g, int b, int a)
+{
+	set_r(CairoColor::clamp(r));
+	set_g(CairoColor::clamp(g));
+	set_b(CairoColor::clamp(b));
+	set_a(CairoColor::clamp(a));
+}
+
+
+
+} // synfig namespace
+
+#endif // __SYNFIG_COLOR_CAIROCOLOR_H
+
diff --git a/src/synfig/color/cairocoloraccumulator.h b/src/synfig/color/cairocoloraccumulator.h
new file mode 100644
index 0000000..680485f
--- /dev/null
+++ b/src/synfig/color/cairocoloraccumulator.h
@@ -0,0 +1,182 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file
+**	\brief CairoColorAccumulator Class Implementation
+**
+**	$Id$
+**
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 2008 Chris Moore
+**	Copyright (c) 2012-2013 Carlos López
+**	Copyright (c) 2015 Diego Barrios Romero
+**
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
+**
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
+**	\endlegal
+*/
+/* ========================================================================= */
+
+#ifndef __SYNFIG_COLOR_CAIROCOLORACUMULATOR_H
+#define __SYNFIG_COLOR_CAIROCOLORACUMULATOR_H
+
+#include <synfig/color/common.h>
+
+namespace synfig {
+
+class CairoColor;
+
+class CairoColorAccumulator
+{
+	friend class CairoColor;
+public:
+	typedef float value_type;
+	
+private:
+	value_type a_, r_, g_, b_;
+	
+public:
+	
+	CairoColorAccumulator &
+	operator+=(const CairoColorAccumulator &rhs)
+	{
+		r_+=rhs.r_;
+		g_+=rhs.g_;
+		b_+=rhs.b_;
+		a_+=rhs.a_;
+		return *this;
+	}
+	
+	CairoColorAccumulator &
+	operator-=(const CairoColorAccumulator &rhs)
+	{
+		r_-=rhs.r_;
+		g_-=rhs.g_;
+		b_-=rhs.b_;
+		a_-=rhs.a_;
+		return *this;
+	}
+	
+	CairoColorAccumulator &
+	operator*=(const float &rhs)
+	{
+		r_*=rhs;
+		g_*=rhs;
+		b_*=rhs;
+		a_*=rhs;
+		return *this;
+	}
+	
+	CairoColorAccumulator &
+	operator/=(const float &rhs)
+	{
+		const float temp(value_type(1)/rhs);
+		r_*=temp;
+		g_*=temp;
+		b_*=temp;
+		a_*=temp;
+		return *this;
+	}
+	
+	CairoColorAccumulator
+	operator+(const CairoColorAccumulator &rhs)const
+	{ return CairoColorAccumulator(*this)+=rhs; }
+	
+	CairoColorAccumulator
+	operator-(const CairoColorAccumulator &rhs)const
+	{ return CairoColorAccumulator(*this)-=rhs; }
+	
+	CairoColorAccumulator
+	operator*(const float &rhs)const
+	{ return CairoColorAccumulator(*this)*=rhs; }
+	
+	CairoColorAccumulator
+	operator/(const float &rhs)const
+	{ return CairoColorAccumulator(*this)/=rhs; }
+	
+	bool
+	operator==(const CairoColorAccumulator &rhs)const
+	{ return r_==rhs.r_ && g_==rhs.g_ && b_==rhs.b_ && a_!=rhs.a_; }
+	
+	bool
+	operator!=(const CairoColorAccumulator &rhs)const
+	{ return r_!=rhs.r_ || g_!=rhs.g_ || b_!=rhs.b_ || a_!=rhs.a_; }
+	
+	CairoColorAccumulator
+	operator-()const
+	{ return CairoColorAccumulator(-r_,-g_,-b_,-a_); }
+	
+	bool is_valid()const
+	{ return !isnan(r_) && !isnan(g_) && !isnan(b_) && !isnan(a_); }
+	
+public:
+	CairoColorAccumulator(): a_(), r_(), g_(), b_() { }
+	
+	/*!	\param R Red
+	 **	\param G Green
+	 **	\param B Blue
+	 **	\param A Opacity(alpha) */
+	CairoColorAccumulator(const value_type& R, const value_type& G, const value_type& B, const value_type& A=1):
+	a_(A),
+	r_(R),
+	g_(G),
+	b_(B) { }
+	
+	//!	Copy constructor
+	CairoColorAccumulator(const CairoColorAccumulator& c):
+	a_(c.a_),
+	r_(c.r_),
+	g_(c.g_),
+	b_(c.b_) { }
+	
+	//!	Converter
+	CairoColorAccumulator(const CairoColor& c):
+	a_(c.get_a()/CairoColor::range),
+	r_(c.get_r()/CairoColor::range),
+	g_(c.get_g()/CairoColor::range),
+	b_(c.get_b()/CairoColor::range) { }
+	
+	//! Converter
+	CairoColorAccumulator(int c): a_(c),r_(c), g_(c), b_(c) { }
+	
+	//! Returns the RED component
+	const value_type& get_r()const { return r_; }
+	
+	//! Returns the GREEN component
+	const value_type& get_g()const { return g_; }
+	
+	//! Returns the BLUE component
+	const value_type& get_b()const { return b_; }
+	
+	//! Returns the amount of opacity (alpha)
+	const value_type& get_a()const { return a_; }
+	
+	//! Synonym for get_a(). \see get_a()
+	const value_type& get_alpha()const { return get_a(); }
+	
+	//! Sets the RED component to \a x
+	CairoColorAccumulator& set_r(const value_type& x) { r_ = x; return *this; }
+	
+	//! Sets the GREEN component to \a x
+	CairoColorAccumulator& set_g(const value_type& x) { g_ = x; return *this; }
+	
+	//! Sets the BLUE component to \a x
+	CairoColorAccumulator& set_b(const value_type& x) { b_ = x; return *this; }
+	
+	//! Sets the opacity (alpha) to \a x
+	CairoColorAccumulator& set_a(const value_type& x) { a_ = x; return *this; }
+	
+	//! Synonym for set_a(). \see set_a()
+	CairoColorAccumulator& set_alpha(const value_type& x) { return set_a(x); }
+};
+
+
+} // synfig namespace
+
+#endif // __SYNFIG_COLOR_CAIROCOLORACUMULATOR_H
diff --git a/src/synfig/color/cairocolorblendingfunctions.h b/src/synfig/color/cairocolorblendingfunctions.h
new file mode 100644
index 0000000..eccba7d
--- /dev/null
+++ b/src/synfig/color/cairocolorblendingfunctions.h
@@ -0,0 +1,560 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file
+**	\brief Color blending function specializations for CairoColor
+**
+**	$Id$
+**
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 2008 Chris Moore
+**	Copyright (c) 2012-2013 Carlos López
+**	Copyright (c) 2015 Diego Barrios Romero
+**
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
+**
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
+**	\endlegal
+*/
+/* ========================================================================= */
+
+#ifndef __SYNFIG_COLOR_CAIROCOLORBLENDINGFUNCTIONS_H
+#define __SYNFIG_COLOR_CAIROCOLORBLENDINGFUNCTIONS_H
+
+#include "colorblendingfunctions.h"
+
+namespace synfig {
+
+typedef CairoColor (*cairoblendfunc)(CairoColor&, CairoColor&, float);
+
+template <>
+CairoColor
+blendfunc_COMPOSITE(CairoColor &a, CairoColor &b, float amount)
+{
+	int ra, ga, ba, aa;
+	int rb, gb, bb, ab;
+	int rc, gc, bc;
+	float ac;
+	
+	float faa, fab, A, AA;
+	
+	ra=a.get_r();
+	ga=a.get_g();
+	ba=a.get_b();
+	aa=a.get_a();
+	aa=aa*amount;
+	A=aa/255.0;
+	AA=1.0-A;
+	
+	rb=b.get_r();
+	gb=b.get_g();
+	bb=b.get_b();
+	ab=b.get_a();
+
+	ac=aa+ab*AA;
+	if(fabsf(ac)<COLOR_EPSILON)
+		return CairoColor::alpha();
+
+	faa=aa/ac;
+	fab=ab*AA/ac;
+
+	rc=ra*faa+rb*fab;
+	gc=ga*faa+gb*fab;
+	bc=ba*faa+bb*fab;
+	
+	return CairoColor(rc, gc, bc, ac);
+
+}
+
+template <>
+CairoColor
+blendfunc_STRAIGHT(CairoColor &a, CairoColor &b, float amount)
+{	
+	int ra, ga, ba, aa; //src
+	int rb, gb, bb, ab; //bg
+	int rc, gc, bc;
+	float ac; //out
+	
+	ra=a.get_r();
+	ga=a.get_g();
+	ba=a.get_b();
+	aa=a.get_a();
+	
+	rb=b.get_r();
+	gb=b.get_g();
+	bb=b.get_b();
+	ab=b.get_a();
+	
+	ac=(aa-ab)*amount+ab;
+	
+	// if ac!=0.0
+	if(fabsf(ac)>COLOR_EPSILON)
+	{
+		rc= ((ra*aa-rb*ab)*amount + rb*ab)/ac;
+		gc= ((ga*aa-gb*ab)*amount + gb*ab)/ac;
+		bc= ((ba*aa-bb*ab)*amount + bb*ab)/ac;
+		return CairoColor(rc, gc, bc, ac);
+	}
+	else
+		return CairoColor::alpha();
+}
+
+template <>
+CairoColor
+blendfunc_ONTO(CairoColor &a, CairoColor &b, float amount)
+{
+	unsigned char alpha(b.get_a());
+	return blendfunc_COMPOSITE(a,b.set_a(255),amount).set_a(alpha);
+}
+
+template <>
+CairoColor
+blendfunc_STRAIGHT_ONTO(CairoColor &a, CairoColor &b, float amount)
+{
+	a.set_a(a.get_a()*b.get_a()/255.0);
+	return CairoColor::blend(a, b, amount, Color::BLEND_STRAIGHT);
+}
+
+template <>
+CairoColor
+blendfunc_BRIGHTEN(CairoColor &a, CairoColor &b, float amount)
+{
+	int ra, ga, ba, aa;
+	int rb, gb, bb, ab;
+	int rc, gc, bc, ac;
+	
+	ra=a.get_r();
+	ga=a.get_g();
+	ba=a.get_b();
+	aa=a.get_a();
+	
+	rb=b.get_r();
+	gb=b.get_g();
+	bb=b.get_b();
+	ab=b.get_a();
+	
+	const float alpha = aa*amount/255.0;
+	const int raab(ra*alpha);
+	const int gaab(ga*alpha);
+	const int baab(ba*alpha);
+	
+	if(rb<raab)
+		rc=raab;
+	else
+		rc=rb;
+		
+	if(gb<gaab)
+		gc=gaab;
+	else
+		gc=gb;
+	
+	if(bb<baab)
+		bc=baab;
+	else
+		bc=bb;
+
+	ac=ab;
+		
+	return CairoColor(rc, gc, bc, ac);
+}
+
+template <>
+CairoColor
+blendfunc_DARKEN(CairoColor &a, CairoColor &b, float amount)
+{
+	int ra, ga, ba, aa;
+	int rb, gb, bb, ab;
+	int rc, gc, bc, ac;
+	
+	ra=a.get_r();
+	ga=a.get_g();
+	ba=a.get_b();
+	aa=a.get_a();
+	
+	rb=b.get_r();
+	gb=b.get_g();
+	bb=b.get_b();
+	ab=b.get_a();
+	
+	const float alpha=aa*amount/255.0;
+
+	int rcompare=(ra-255)*alpha+255;
+	if(rb > rcompare)
+		rc=rcompare;
+	else
+		rc=rb;
+		
+	int gcompare=(ga-255)*alpha+255;
+	if(gb > gcompare)
+		gc=gcompare;
+	else
+		gc=gb;
+
+	int bcompare=(ba-255)*alpha+255;
+	if(bb > bcompare)
+		bc=bcompare;
+	else
+		bc=bb;
+	
+	ac=ab;
+	
+	return CairoColor(rc, gc, bc, ac);
+}
+
+template <>
+CairoColor
+blendfunc_ADD(CairoColor &a, CairoColor &b, float amount)
+{
+	int ra, ga, ba, aa;
+	int rb, gb, bb, ab;
+	int rc, gc, bc, ac;
+	
+	ra=a.get_r();
+	ga=a.get_g();
+	ba=a.get_b();
+	aa=a.get_a();
+	
+	rb=b.get_r();
+	gb=b.get_g();
+	bb=b.get_b();
+	ab=b.get_a();
+	
+	const float aaa=aa*amount/255.0;
+	
+	rc=rb+ra*aaa;
+	gc=gb+ga*aaa;
+	bc=bb+ba*aaa;
+	ac=ab;
+
+	return CairoColor(rc, gc, bc, ac);
+}
+
+//Specialization for CairoColor
+template <>
+CairoColor
+blendfunc_SUBTRACT(CairoColor &a, CairoColor &b, float amount)
+{
+	int ra, ga, ba, aa;
+	int rb, gb, bb, ab;
+	int rc, gc, bc, ac;
+	
+	ra=a.get_r();
+	ga=a.get_g();
+	ba=a.get_b();
+	aa=a.get_a();
+	
+	rb=b.get_r();
+	gb=b.get_g();
+	bb=b.get_b();
+	ab=b.get_a();
+	
+	const float aaa=aa*amount/255.0;
+	
+	rc=rb-ra*aaa;
+	gc=gb-ga*aaa;
+	bc=bb-ba*aaa;
+	ac=ab;
+	
+	return CairoColor(rc, gc, bc, ac);
+}
+
+template <>
+CairoColor
+blendfunc_DIFFERENCE(CairoColor &a, CairoColor &b, float amount)
+{
+	int ra, ga, ba, aa;
+	int rb, gb, bb, ab;
+	int rc, gc, bc, ac;
+	
+	ra=a.get_r();
+	ga=a.get_g();
+	ba=a.get_b();
+	aa=a.get_a();
+	
+	rb=b.get_r();
+	gb=b.get_g();
+	bb=b.get_b();
+	ab=b.get_a();
+	
+	const float aaa=aa*amount/255.0;
+	
+	rc=std::abs(rb-ra*aaa);
+	gc=std::abs(gb-ga*aaa);
+	bc=std::abs(bb-ba*aaa);
+	ac=ab;
+	
+	return CairoColor(rc, gc, bc, ac);
+}
+
+template <>
+CairoColor
+blendfunc_MULTIPLY(CairoColor &a,CairoColor &b, float amount)
+{
+	if(amount<0) a=~a, amount=-amount;
+	amount*=a.get_a()/255.0;
+	int ra, ga, ba;
+	int rb, gb, bb;
+
+	ra=a.get_r();
+	ga=a.get_g();
+	ba=a.get_b();
+	
+	rb=b.get_r();
+	gb=b.get_g();
+	bb=b.get_b();
+	
+	b.set_r((rb*ra*amount/255.0)+rb*(1.0-amount));
+	b.set_g((gb*ga*amount/255.0)+gb*(1.0-amount));
+	b.set_b((bb*ba*amount/255.0)+bb*(1.0-amount));
+	return b;
+}
+
+template <>
+CairoColor
+blendfunc_DIVIDE(CairoColor &a, CairoColor &b, float amount)
+{
+	int ra, ga, ba, aa;
+	int rb, gb, bb, ab;
+	int rc, gc, bc, ac;
+
+	ra=a.get_r();
+	ga=a.get_g();
+	ba=a.get_b();
+	aa=a.get_a();
+	
+	rb=b.get_r();
+	gb=b.get_g();
+	bb=b.get_b();
+	ab=b.get_a();
+	
+	const float alpha=amount*aa/255.0;
+	const float ahpla=1.0-alpha;
+	
+	if(alpha<COLOR_EPSILON)
+		return b;
+	
+	ac=ab;
+	if(ra==0)
+		rc=rb;
+	else
+		rc=rb*(alpha*255)/(ra) + ahpla*rb;
+		
+	if(ga==0)
+		gc=gb;
+	else
+		gc=gb*(alpha*255)/(ga) + ahpla*gb;
+		
+	if(ba==0)
+		bc=bb;
+	else
+		bc=bb*(alpha*255)/(ba) + ahpla*bb;
+		
+	return CairoColor(rc, gc, bc, ac);
+}
+
+template <>
+CairoColor
+blendfunc_COLOR(CairoColor &a, CairoColor &b, float amount)
+{
+	return CairoColor(Color::blend(Color(a), Color(b), amount, Color::BLEND_COLOR));
+}
+
+template <>
+CairoColor
+blendfunc_HUE(CairoColor &a, CairoColor &b, float amount)
+{
+	return CairoColor(Color::blend(Color(a), Color(b), amount, Color::BLEND_HUE));
+}
+
+template <>
+CairoColor
+blendfunc_SATURATION(CairoColor &a, CairoColor &b, float amount)
+{
+	return CairoColor(Color::blend(Color(a), Color(b), amount, Color::BLEND_SATURATION));
+}
+
+template <>
+CairoColor
+blendfunc_LUMINANCE(CairoColor &a, CairoColor &b, float amount)
+{
+	return CairoColor(Color::blend(Color(a), Color(b), amount, Color::BLEND_LUMINANCE));
+}
+
+template <>
+CairoColor
+blendfunc_BEHIND(CairoColor &a, CairoColor &b, float amount)
+{
+	a.set_a(a.get_a()*amount);
+	return CairoColor::blend(b, a, 1.0, Color::BLEND_COMPOSITE);
+}
+
+template <>
+CairoColor
+blendfunc_ALPHA_BRIGHTEN(CairoColor &a, CairoColor &b, float amount)
+{
+	// \todo can this be right, multiplying amount by *b*'s alpha?
+	// compare with blendfunc_BRIGHTEN where it is multiplied by *a*'s
+	//if(a.get_a() < b.get_a()*amount)
+	//	return a.set_a(a.get_a()*amount);
+	//return b;
+	unsigned char ra, ga, ba, aa;
+	unsigned char ab;
+	unsigned char rc, gc, bc, ac;
+	
+	ra=a.get_r();
+	ga=a.get_g();
+	ba=a.get_b();
+	aa=a.get_a();
+	
+	ab=b.get_a();
+	
+	ac=aa*amount;
+	if(aa < ab*amount)
+	{
+		float acaa=(aa*amount)/aa;
+		rc=ra*acaa;
+		gc=ga*acaa;
+		bc=ba*acaa;
+		return CairoColor(rc, gc, bc, ac);
+	}
+	else
+		return b;	
+}
+
+template <>
+CairoColor
+blendfunc_ALPHA_DARKEN(CairoColor &a, CairoColor &b, float amount)
+{
+	unsigned char ra, ga, ba, aa;
+	unsigned char ab;
+	unsigned char rc, gc, bc, ac;
+	
+	ra=a.get_r();
+	ga=a.get_g();
+	ba=a.get_b();
+	aa=a.get_a();
+	
+	ab=b.get_a();
+	
+	ac=aa*amount;
+	if(ac > ab)
+	{
+		float acaa=(aa*amount)/aa;
+		rc=ra*acaa;
+		gc=ga*acaa;
+		bc=ba*acaa;
+		return CairoColor(rc, gc, bc, ac);
+	}
+	else
+		return b;
+}
+
+template <>
+CairoColor
+blendfunc_SCREEN(CairoColor &a, CairoColor &b, float amount)
+{
+	if(amount<0) a=~a, amount=-amount;
+	
+	a.set_r(255-(255-a.get_r())*(1.0-b.get_r()/255.0));
+	a.set_g(255-(255-a.get_g())*(1.0-b.get_g()/255.0));
+	a.set_b(255-(255-a.get_b())*(1.0-b.get_b()/255.0));
+
+	return blendfunc_ONTO(a,b,amount);
+}
+
+template <>
+CairoColor
+blendfunc_OVERLAY<CairoColor>(CairoColor &a,CairoColor &b,float amount)
+{
+	if(amount<0) a=~a, amount=-amount;
+	
+	int ra, ga, ba, aa, ras, gas, bas;
+	int rb, gb, bb, ab;
+
+	ra=a.get_r();
+	ras=ra*ra;
+	ga=a.get_g();
+	gas=ga*ga;
+	ba=a.get_b();
+	bas=ba*ba;
+	aa=a.get_a();
+
+	rb=b.get_r();
+	gb=b.get_g();
+	bb=b.get_b();
+	ab=b.get_a();
+	
+	
+	int rc, gc, bc, ac;
+	
+	if(aa==0 || ab==0) return CairoColor();
+	
+	rc=(2*rb*ra+ras-2*rb*ras/255.0)/255.0;
+	gc=(2*gb*ga+gas-2*gb*gas/255.0)/255.0;
+	bc=(2*bb*ba+bas-2*bb*bas/255.0)/255.0;
+	ac=aa;
+	
+	return CairoColor::blend(CairoColor(rc, gc, bc, ac), b, amount, Color::BLEND_ONTO);
+}
+
+template <>
+CairoColor
+blendfunc_HARD_LIGHT(CairoColor &a, CairoColor &b, float amount)
+{
+	if(amount<0) a=~a, amount=-amount;
+	
+	int ra, ga, ba, aa;
+	int rb, gb, bb;
+	int rc, gc, bc;
+	
+	ra=a.get_r();
+	ga=a.get_g();
+	ba=a.get_b();
+	aa=a.get_a();
+	
+	rb=b.get_r();
+	gb=b.get_g();
+	bb=b.get_b();
+	
+	if(ra>127)	rc =255 -  (255-(ra*2-255))  *  (255-rb)/255.0;
+	else		rc= rb*(ra*2)/255.0;
+	if(ga>127)	gc =255 -  (255-(ga*2-255))  *  (255-gb)/255.0;
+	else		gc= gb*(ga*2)/255.0;
+	if(ba>127)	bc =255 -  (255-(ba*2-255))  *  (255-bb)/255.0;
+	else		bc= bb*(ba*2)/255.0;
+
+	return CairoColor::blend(CairoColor(rc, gc, bc, aa),b,amount, Color::BLEND_ONTO);
+//
+//	if(a.get_r()>half)	a.set_r(one-(one-(a.get_r()*2*one-one))*(one-b.get_r()));
+//	else				a.set_r(b.get_r()*(a.get_r()*2*one));
+//	if(a.get_g()>half)	a.set_g(one-(one-(a.get_g()*2*one-one))*(one-b.get_g()));
+//	else				a.set_g(b.get_g()*(a.get_g()*2*one));
+//	if(a.get_b()>half)	a.set_b(one-(one-(a.get_b()*2*one-one))*(one-b.get_b()));
+//	else				a.set_b(b.get_b()*(a.get_b()*2*one));
+//	
+//	return blendfunc_ONTO(a,b,amount);
+}
+
+template <>
+CairoColor
+blendfunc_ALPHA_OVER(CairoColor &a, CairoColor &b, float amount)
+{
+	CairoColor rm(b);
+	
+	//multiply the inverse alpha channel with the one below us
+	rm.set_a((255-a.get_a())*b.get_a()/255.0);
+	
+	return CairoColor::blend(rm,b,amount, Color::BLEND_STRAIGHT);
+}
+
+
+} // synfig namespace
+
+
+#endif // __SYNFIG_COLOR_CAIROCOLORBLENDINGFUNCTIONS_H
+
diff --git a/src/synfig/color/color.cpp b/src/synfig/color/color.cpp
new file mode 100644
index 0000000..935a087
--- /dev/null
+++ b/src/synfig/color/color.cpp
@@ -0,0 +1,246 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file color.cpp
+**	\brief Color Class implementation
+**
+**	$Id$
+**
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 2008 Chris Moore
+**	Copyright (c) 2012-2013 Carlos López
+**	Copyright (c) 2015 Diego Barrios Romero
+**
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
+**
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
+**	\endlegal
+*/
+/* ========================================================================= */
+
+/* === H E A D E R S ======================================================= */
+
+#ifdef USING_PCH
+#	include "pch.h"
+#else
+#ifdef HAVE_CONFIG_H
+#	include <config.h>
+#endif
+
+#include <ETL/angle>
+#include "color.h"
+#include <cstdio>
+#include <sstream>
+#include <iostream>
+#include <iomanip>
+
+#include "colorblendingfunctions.h"
+
+#endif
+
+using namespace synfig;
+using namespace etl;
+using namespace std;
+
+#define COLOR_EPSILON	(0.000001f)
+
+const Color::value_type Color::ceil=1;
+const Color::value_type Color::floor=0;
+
+/* === M E T H O D S ======================================================= */
+
+ColorReal
+Color::hex2real(String s)
+{
+	std::istringstream i(s);
+	int n;
+	i.fill('0');
+	if (!(i >> hex >> n))
+		throw String("bad conversion from hex string \"") + s + String("\"");
+	return n / 255.0f;
+}
+
+const String
+Color::real2hex(ColorReal c)
+{
+	std::ostringstream o;
+	o.width(2);
+	o.fill('0');
+	if (c<0) c = 0;
+	if (c>1) c = 1;
+	o << hex << int(c*255.0f);
+	return o.str();
+}
+
+void
+Color::set_hex(String& str)
+{
+	value_type r, g, b;
+	String hex;
+
+	// use just the hex characters
+	for (String::const_iterator iter = str.begin(); iter != str.end(); iter++)
+		if (isxdigit(*iter))
+			hex.push_back(*iter);
+
+	try
+	{
+		if (hex.size() == 1)
+		{
+			r = hex2real(hex.substr(0,1)+hex.substr(0,1));
+			r_ = g_ = b_ = r;
+		}
+		else if (hex.size() == 3)
+		{
+			r = hex2real(hex.substr(0,1)+hex.substr(0,1));
+			g = hex2real(hex.substr(1,1)+hex.substr(1,1));
+			b = hex2real(hex.substr(2,1)+hex.substr(2,1));
+			r_ = r; g_ = g; b_ = b;
+		}
+		else if (hex.size() == 6)
+		{
+			r = hex2real(hex.substr(0,2));
+			g = hex2real(hex.substr(2,2));
+			b = hex2real(hex.substr(4,2));
+			r_ = r; g_ = g; b_ = b;
+		}
+	}
+	catch (string s)
+	{
+		printf("caught <%s>\n", s.c_str());
+		return;
+	}
+}
+
+const String
+Color::get_string(void)const
+{
+	std::ostringstream o;
+	o << std::fixed << std::setprecision(3) << "#" << get_hex().c_str() << " : " << std::setw(6) << a_;
+	return String(o.str().c_str());
+}
+
+Color
+Color::clamped_negative()const
+{
+	Color ret=*this;
+
+	if(ret.a_==0)
+		return alpha();
+
+	if(ret.a_<0)
+		ret=-ret;
+
+	if(ret.r_<0)
+	{
+		ret.g_-=ret.r_;
+		ret.b_-=ret.r_;
+		ret.r_=0.0f;
+	}
+	if(ret.g_<0)
+	{
+		ret.r_-=ret.g_;
+		ret.b_-=ret.g_;
+		ret.g_=0.0f;
+	}
+	if(ret.b_<0)
+	{
+		ret.r_-=ret.b_;
+		ret.g_-=ret.b_;
+		ret.b_=0.0f;
+	}
+
+	if(ret.r_>1) ret.r_=1;
+	if(ret.g_>1) ret.g_=1;
+	if(ret.b_>1) ret.b_=1;
+	if(ret.a_>1) ret.a_=1;
+
+	if(isnan(ret.get_r())) ret.r_=0.5;
+	if(isnan(ret.get_g())) ret.g_=0.5;
+	if(isnan(ret.get_b())) ret.b_=0.5;
+	if(isnan(ret.get_a())) ret.a_=1;
+
+/*
+	if(ret.r_>1) { ret.g_/=ret.r_; ret.b_/=ret.r_; ret.r_=1; }
+	if(ret.g_>1) { ret.r_/=ret.g_; ret.b_/=ret.g_; ret.g_=1; }
+	if(ret.b_>1) { ret.g_/=ret.b_; ret.r_/=ret.b_; ret.b_=1; }
+	if(ret.a_>1) ret.a_=1;
+*/
+
+	return ret;
+}
+
+Color
+Color::clamped()const
+{
+	Color ret(*this);
+	if(ret.get_r()<0)
+		ret.set_r(0);
+	if(ret.get_g()<0)
+		ret.set_g(0);
+	if(ret.get_b()<0)
+		ret.set_b(0);
+	if(ret.get_a()<0)
+		ret.set_a(0);
+
+	if(ret.r_>1) ret.r_=1;
+	if(ret.g_>1) ret.g_=1;
+	if(ret.b_>1) ret.b_=1;
+	if(ret.a_>1) ret.a_=1;
+
+	if(isnan(ret.get_r())) ret.r_=0.5;
+	if(isnan(ret.get_g())) ret.g_=0.5;
+	if(isnan(ret.get_b())) ret.b_=0.5;
+	if(isnan(ret.get_a())) ret.a_=1;
+
+	return(ret);
+}
+
+
+Color
+Color::blend(Color a, Color b,float amount, Color::BlendMethod type)
+{
+	// No matter what blend method is being used,
+	// if the amount is equal to zero, then only B
+	// will shine through
+	if(fabsf(amount)<=COLOR_EPSILON)return b;
+
+	assert(type<BLEND_END);
+
+	const static blendfunc vtable[BLEND_END]=
+	{
+        // WARNING: any change here must be coordinated with
+        // other specializations of the functions, for example
+        // for CairoColor
+		blendfunc_COMPOSITE<Color>,	// 0
+		blendfunc_STRAIGHT<Color>,
+		blendfunc_BRIGHTEN<Color>,
+		blendfunc_DARKEN<Color>,
+		blendfunc_ADD<Color>,
+		blendfunc_SUBTRACT<Color>,		// 5
+		blendfunc_MULTIPLY<Color>,
+		blendfunc_DIVIDE<Color>,
+		blendfunc_COLOR<Color>,
+		blendfunc_HUE<Color>,
+		blendfunc_SATURATION<Color>,	// 10
+		blendfunc_LUMINANCE<Color>,
+		blendfunc_BEHIND<Color>,
+		blendfunc_ONTO<Color>,
+		blendfunc_ALPHA_BRIGHTEN<Color>,
+		blendfunc_ALPHA_DARKEN<Color>,	// 15
+		blendfunc_SCREEN<Color>,
+		blendfunc_HARD_LIGHT<Color>,
+		blendfunc_DIFFERENCE<Color>,
+		blendfunc_ALPHA_OVER<Color>,
+		blendfunc_OVERLAY<Color>,		// 20
+		blendfunc_STRAIGHT_ONTO<Color>,
+	};
+
+	return vtable[type](a,b,amount);
+}
+
diff --git a/src/synfig/color/color.h b/src/synfig/color/color.h
new file mode 100644
index 0000000..37289d4
--- /dev/null
+++ b/src/synfig/color/color.h
@@ -0,0 +1,343 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file color.h
+**	\brief Color Class
+**
+**	$Id$
+**
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 2008 Chris Moore
+**	Copyright (c) 2012-2013 Carlos López
+**  Copyright (c) 2015 Diego Barrios Romero
+**
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
+**
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
+**	\endlegal
+*/
+/* ========================================================================= */
+
+#ifndef __SYNFIG_COLOR_COLOR_H
+#define __SYNFIG_COLOR_COLOR_H
+
+#include <synfig/color/common.h>
+
+namespace synfig {
+
+class CairoColor;
+
+/*!	\class Color
+**	\ ARGB 128 bits Color class implementation 
+**	Future optimizations: lookup table for sqrt()?
+*/
+class Color
+{
+public:
+	typedef ColorReal value_type;
+
+private:
+	value_type a_, r_, g_, b_;
+
+public:
+	
+	static const value_type ceil;
+	static const value_type floor;
+	
+	const String get_string(void) const;
+
+	inline Color &	operator+= (const Color &rhs);
+    inline Color &	operator-= (const Color &rhs);
+	inline Color &	operator*= (const float &rhs);
+	inline Color &	operator/= (const float &rhs);
+
+	inline Color operator+ (const Color &rhs) const;
+	inline Color operator- (const Color &rhs) const;
+	inline Color operator* (const float &rhs) const;
+	inline Color operator/ (const float &rhs) const;
+	inline bool operator== (const Color &rhs) const;
+	inline bool operator!= (const Color &rhs) const;
+	inline Color operator- () const;
+	//! Effectively 1.0-color
+	inline Color operator~() const;
+
+	inline bool is_valid() const;
+
+	inline Color premult_alpha() const;
+	inline Color demult_alpha() const;
+
+public:
+	// ETL/trunk/ETL/_gaussian.h does:
+	//   SR1=SR2=SR3=typename T::value_type();
+	// and expects that to give it initialized colors
+	// Otherwise the 'gaussian' blur type is random.
+	inline Color();
+	inline Color(const value_type &f);
+	inline Color(int f);
+
+	/*!	\param R Red
+	**	\param G Green
+	**	\param B Blue
+	**	\param A Opacity(alpha) */
+	inline Color(const value_type& R, const value_type& G,
+          const value_type& B, const value_type& A=1);
+
+	/*!	\param c Source for color components
+	**	\param A Opacity(alpha) */
+	inline Color(const Color& c, const value_type& A);
+
+	//!	Copy constructor
+	inline Color(const Color& c);
+
+	//! Convert from CairoColor to Color
+	inline Color(const CairoColor& c);
+	
+#ifdef USE_HALF_TYPE
+	friend class ColorAccumulator;
+	//!	Convert constructor
+	inline Color(const ColorAccumulator& c);
+#endif
+
+	//!	Copy constructor
+	//Color(const Color &c) { memcpy((void*)this, (const void*)&c, sizeof(Color)); }
+
+	/*const Color &operator=(const value_type &i)
+	{
+		r_ = g_ = b_ = a_ = i;
+		return *this;
+	}*/
+	//Color& operator=(const Color &c) { memcpy((void*)this, (const void*)&c, sizeof(Color)); return *this; }
+
+	//! Returns the RED component
+	const value_type& get_r()const { return r_; }
+
+	//! Returns the GREEN component
+	const value_type& get_g()const { return g_; }
+
+	//! Returns the BLUE component
+	const value_type& get_b()const { return b_; }
+
+	//! Returns the amount of opacity (alpha)
+	const value_type& get_a()const { return a_; }
+
+	//! Synonym for get_a(). \see get_a()
+	const value_type& get_alpha()const { return get_a(); }
+
+	//! Converts a 2 character hex string \a s (00-ff) into a ColorReal (0.0-1.0)
+	static ColorReal hex2real(String s);
+
+	//! Converts a ColorReal \a c (0.0-1.0) into a 2 character hex string (00-ff)
+	static const String real2hex(ColorReal c);
+
+	//! Returns the color as a 6 character hex sting
+	inline const String get_hex()const;
+
+	//! Sets the color's R, G, and B from a 3 or 6 character hex string
+	void set_hex(String& hex);
+
+	//! Sets the RED component to \a x
+	Color& set_r(const value_type& x) { r_ = x; return *this; }
+
+	//! Sets the GREEN component to \a x
+	Color& set_g(const value_type& x) { g_ = x; return *this; }
+
+	//! Sets the BLUE component to \a x
+	Color& set_b(const value_type& x) { b_ = x; return *this; }
+
+	//! Sets the opacity (alpha) to \a x
+	Color& set_a(const value_type& x) { a_ = x; return *this; }
+
+	//! Synonym for set_a(). \see set_a()
+	Color& set_alpha(const value_type& x) { return set_a(x); }
+
+	//! Returns color's luminance
+	inline float get_y() const;
+
+	//! Returns U component of chromanance
+	inline float get_u() const;
+
+	//! Returns V component of chromanance
+	inline float get_v() const;
+
+	//! Returns the color's saturation
+	/*!	This is is the magnitude of the U and V components.
+	**	\see set_s() */
+	inline float get_s() const;
+
+	//! Sets the luminance (\a y) and chromanance (\a u and \a v)
+	inline Color& set_yuv(const float &y, const float &u, const float &v);
+
+	//! Sets color luminance
+	inline Color& set_y(const float &y);
+
+	//! Set U component of chromanance
+	inline Color& set_u(const float &u);
+
+	//! Set V component of chromanance
+	inline Color& set_v(const float &v);
+
+	//! Set the U and V components of chromanance
+	inline Color& set_uv(const float& u, const float& v);
+
+	//! Sets the color's saturation
+	/*!	\see get_s() */
+	inline Color& set_s(const float &x);
+
+	//! YUV Color constructor
+	inline static Color YUV(const float& y, const float& u,
+                     const float& v, const value_type& a=1);
+
+	//! Returns the hue of the chromanance
+	/*!	This is the angle of the U and V components.
+	**	\see set_hue() */
+	inline Angle get_hue() const;
+
+	//! Synonym for get_hue(). \see get_hue()
+	inline Angle get_uv_angle() const;
+
+	//! Sets the color's hue
+	/*!	\see get_hue() */
+	inline Color& set_hue(const Angle& theta);
+
+	//! Synonym for set_hue(). \see set_hue()
+	inline Color& set_uv_angle(const Angle& theta);
+
+	//! Rotates the chromanance vector by amount specified by \a theta
+	inline Color& rotate_uv(const Angle& theta);
+
+	//! Sets the luminance (\a y) and chromanance (\a s and \a theta).
+	/*!	\param y Luminance
+	**	\param s Saturation
+	**	\param theta Hue */
+	inline Color& set_yuv(const float& y, const float& s, const Angle& theta);
+
+	//! YUV color constructor where the chroma is in the saturation/hue form.
+	/*!	\param y Luminance
+	**	\param s Saturation
+	**	\param theta Hue
+	**	\param a Opacity (alpha) */
+	inline static Color YUV(const float& y,
+                     const float& s,
+                     const Angle& theta,
+                     const value_type& a=1);
+
+
+	//! Clamps a color so that its values are in range. Ignores attempting to visualize negative colors.
+    Color clamped() const;
+
+	//! Clamps a color so that its values are in range.
+    Color clamped_negative() const;
+
+	/* Preset Colors */
+
+	//! Preset Color Constructors
+	//@{
+#ifdef HAS_VIMAGE
+	static inline Color alpha() { return Color(0,0,0,0.0000001f); }
+#else
+	static inline Color alpha() { return Color(0,0,0,0); }
+#endif
+	static inline Color black() { return Color(0,0,0); }
+	static inline Color white() { return Color(1,1,1); }
+	static inline Color gray() { return Color(0.5f,0.5f,0.5f); }
+	static inline Color magenta() { return Color(1,0,1); }
+	static inline Color red() { return Color(1,0,0); }
+	static inline Color green() { return Color(0,1,0); }
+	static inline Color blue() { return Color(0,0,1); }
+	static inline Color cyan() { return Color(0,1,1); }
+	static inline Color yellow() { return Color(1,1,0); }
+	//@}
+
+	//! \writeme
+	enum BlendMethod
+	{
+		BLEND_COMPOSITE=0,			//!< Color A is composited onto B (Taking A's alpha into account)
+		BLEND_STRAIGHT=1,			//!< Straight linear interpolation from A->B (Alpha ignored)
+		BLEND_ONTO=13,				//!< Similar to BLEND_COMPOSITE, except that B's alpha is maintained
+		BLEND_STRAIGHT_ONTO=21,		//!< \deprecated \writeme
+		BLEND_BEHIND=12,			//!< Similar to BLEND_COMPOSITE, except that B is composited onto A.
+		BLEND_SCREEN=16,			//!< \writeme
+		BLEND_OVERLAY=20,			//!< \writeme
+		BLEND_HARD_LIGHT=17,		//!< \writeme
+		BLEND_MULTIPLY=6,			//!< Simple A*B.
+		BLEND_DIVIDE=7,				//!< Simple B/A
+		BLEND_ADD=4,				//!< Simple A+B.
+		BLEND_SUBTRACT=5,			//!< Simple A-B.
+		BLEND_DIFFERENCE=18,		//!< Simple |A-B|.
+		BLEND_BRIGHTEN=2,			//!< If composite is brighter than B, use composite. B otherwise.
+		BLEND_DARKEN=3,				//!< If composite is darker than B, use composite. B otherwise.
+		BLEND_COLOR=8,				//!< Preserves the U and V channels of color A
+		BLEND_HUE=9,				//!< Preserves the angle of the UV vector of color A
+		BLEND_SATURATION=10,		//!< Preserves the magnitude of the UV Vector of color A
+		BLEND_LUMINANCE=11,			//!< Preserves the Y channel of color A
+
+		BLEND_ALPHA_BRIGHTEN=14,	//!< \deprecated If A is less opaque than B, use A
+		BLEND_ALPHA_DARKEN=15,		//!< \deprecated If A is more opaque than B, use B
+		BLEND_ALPHA_OVER=19,		//!< \deprecated multiply alphas and then straight blends using the amount
+
+		BLEND_END=22,				//!< \internal
+		BLEND_BY_LAYER=999			//! Used to let the layer decides what Blend Method use by
+									//! default when the layer is created
+	};
+
+	/* Other */
+	static Color blend(Color a, Color b,float amount,BlendMethod type=BLEND_COMPOSITE);
+
+	static bool is_onto(BlendMethod x)
+	{
+		return x==BLEND_BRIGHTEN
+			|| x==BLEND_DARKEN
+			|| x==BLEND_ADD
+			|| x==BLEND_SUBTRACT
+			|| x==BLEND_MULTIPLY
+			|| x==BLEND_DIVIDE
+			|| x==BLEND_COLOR
+			|| x==BLEND_HUE
+			|| x==BLEND_SATURATION
+			|| x==BLEND_LUMINANCE
+			|| x==BLEND_ONTO
+			|| x==BLEND_STRAIGHT_ONTO
+			|| x==BLEND_SCREEN
+			|| x==BLEND_OVERLAY
+			|| x==BLEND_DIFFERENCE
+			|| x==BLEND_HARD_LIGHT
+		;
+	}
+
+	//! a blending method is considered 'straight' if transparent pixels in the upper layer can affect the result of the blend
+	static bool is_straight(BlendMethod x)
+	{
+		return x==BLEND_STRAIGHT
+			|| x==BLEND_STRAIGHT_ONTO
+			|| x==BLEND_ALPHA_BRIGHTEN
+		;
+	}
+/*protected:
+
+	value_type& operator[](const int i)
+	{
+		assert(i>=0);
+		assert(i<(signed)(sizeof(Color)/sizeof(value_type)));
+		return (&r_)[i];
+	}
+
+	const value_type& operator[](const int i)const
+	{
+		assert(i>=0);
+		assert(i<(signed)(sizeof(Color)/sizeof(value_type)));
+		return (&r_)[i];
+	}
+*/
+}; // END of class Color
+
+} // synfig namespace
+
+#include "color.hpp"
+
+#endif // __SYNFIG_COLOR_COLOR_H
+
diff --git a/src/synfig/color/color.hpp b/src/synfig/color/color.hpp
new file mode 100644
index 0000000..0a34ccc
--- /dev/null
+++ b/src/synfig/color/color.hpp
@@ -0,0 +1,329 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file
+**	\brief Color class function implementation
+**
+**	$Id$
+**
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 2008 Chris Moore
+**	Copyright (c) 2012-2013 Carlos López
+**	Copyright (c) 2015 Diego Barrios Romero
+**
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
+**
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
+**	\endlegal
+*/
+/* ========================================================================= */
+
+#ifndef __SYNFIG_COLOR_COLOR_HPP
+#define __SYNFIG_COLOR_COLOR_HPP
+
+#include <cmath>
+#include <cassert>
+#include <stdint.h>
+
+#include <synfig/gamma.h>
+#include <synfig/string.h>
+#include <synfig/angle.h>
+
+
+#ifdef USE_HALF_TYPE
+#include <OpenEXR/half.h>
+#endif
+#ifdef USING_PCH
+#	include "pch.h"
+#else
+#ifdef HAVE_CONFIG_H
+#	include <config.h>
+#endif
+
+#include <ETL/angle>
+#include <cstdio>
+
+#endif
+
+namespace synfig {
+
+Color&	Color::operator+=(const Color &rhs)
+{
+	r_+=rhs.r_;
+	g_+=rhs.g_;
+	b_+=rhs.b_;
+	a_+=rhs.a_;
+	return *this;
+}
+
+Color& Color::operator-=(const Color &rhs)
+{
+	r_-=rhs.r_;
+	g_-=rhs.g_;
+	b_-=rhs.b_;
+	a_-=rhs.a_;
+	return *this;
+}
+
+Color& Color::operator*=(const float &rhs)
+{
+	r_*=rhs;
+	g_*=rhs;
+	b_*=rhs;
+	a_*=rhs;
+	return *this;
+}
+
+Color& Color::operator/=(const float &rhs)
+{
+	const float temp(value_type(1)/rhs);
+	r_*=temp;
+	g_*=temp;
+	b_*=temp;
+	a_*=temp;
+	return *this;
+}
+
+Color Color::operator+(const Color &rhs) const
+{
+    return Color(*this)+=rhs;
+}
+
+Color Color::operator-(const Color &rhs) const
+{ return Color(*this)-=rhs; }
+
+Color Color::operator*(const float &rhs)const
+{ return Color(*this)*=rhs; }
+
+Color Color::operator/(const float &rhs)const
+{ return Color(*this)/=rhs; }
+
+bool Color::operator==(const Color &rhs)const
+{ return r_==rhs.r_ && g_==rhs.g_ && b_==rhs.b_ && a_==rhs.a_; }
+
+bool Color::operator!=(const Color &rhs)const
+{ return r_!=rhs.r_ || g_!=rhs.g_ || b_!=rhs.b_ || a_!=rhs.a_; }
+
+Color Color::operator-()const
+{ return Color(-r_,-g_,-b_,-a_); }
+
+//! Effectively 1.0-color
+Color Color::operator~()const
+{ return Color(1.0f-r_,1.0f-g_,1.0f-b_,a_); }
+
+bool Color::is_valid()const
+{ return !isnan(r_) && !isnan(g_) && !isnan(b_) && !isnan(a_); }
+
+Color Color::premult_alpha() const
+{
+	return Color (r_*a_, g_*a_, b_*a_, a_);
+}
+
+Color Color::demult_alpha() const
+{
+	if(a_)
+	{
+		const value_type inva = 1/a_;
+		return Color (r_*inva, g_*inva, b_*inva, a_);
+	}else return alpha();
+}
+
+Color::Color() :a_(0), r_(0), g_(0), b_(0) { }
+Color::Color(const value_type &f) :a_(f),r_(f), g_(f), b_(f) { }
+Color::Color(int f) :a_(f),r_(f), g_(f), b_(f) { }
+
+Color::Color(const value_type& R,
+             const value_type& G,
+             const value_type& B,
+             const value_type& A):
+	a_(A),
+	r_(R),
+	g_(G),
+	b_(B) { }
+
+Color::Color(const Color& c, const value_type& A):
+	a_(A),
+	r_(c.r_),
+	g_(c.g_),
+	b_(c.b_) { }
+
+Color::Color(const Color& c):
+	a_(c.a_),
+	r_(c.r_),
+	g_(c.g_),
+	b_(c.b_) { }
+
+#ifdef USE_HALF_TYPE
+	friend class ColorAccumulator;
+	//!	Convert constructor
+	Color(const ColorAccumulator& c);
+#endif
+
+	//!	Copy constructor
+	//Color(const Color &c) { memcpy((void*)this, (const void*)&c, sizeof(Color)); }
+
+	/*const Color &operator=(const value_type &i)
+	{
+		r_ = g_ = b_ = a_ = i;
+		return *this;
+	}*/
+	//Color& operator=(const Color &c) { memcpy((void*)this, (const void*)&c, sizeof(Color)); return *this; }
+
+
+const String Color::get_hex()const
+{
+    return String(real2hex(r_) + real2hex(g_) + real2hex(b_));
+}
+
+
+//! Returns color's luminance
+float Color::get_y() const
+{
+	return
+		(float)get_r()*EncodeYUV[0][0]+
+		(float)get_g()*EncodeYUV[0][1]+
+		(float)get_b()*EncodeYUV[0][2];
+}
+
+
+//! Returns U component of chromanance
+float Color::get_u() const
+{
+	return
+		(float)get_r()*EncodeYUV[1][0]+
+		(float)get_g()*EncodeYUV[1][1]+
+		(float)get_b()*EncodeYUV[1][2];
+}
+
+
+	//! Returns V component of chromanance
+float Color::get_v() const
+{
+	return
+		(float)get_r()*EncodeYUV[2][0]+
+		(float)get_g()*EncodeYUV[2][1]+
+		(float)get_b()*EncodeYUV[2][2];
+}
+
+//! Returns the color's saturation
+/*!	This is is the magnitude of the U and V components.
+**	\see set_s() */
+float Color::get_s() const
+{
+	const float u(get_u()), v(get_v());
+	return sqrt(u*u+v*v);
+}
+
+//! Sets the luminance (\a y) and chromanance (\a u and \a v)
+Color& Color::set_yuv(const float &y, const float &u, const float &v)
+{
+	set_r(y*DecodeYUV[0][0]+u*DecodeYUV[0][1]+v*DecodeYUV[0][2]);
+	set_g(y*DecodeYUV[1][0]+u*DecodeYUV[1][1]+v*DecodeYUV[1][2]);
+	set_b(y*DecodeYUV[2][0]+u*DecodeYUV[2][1]+v*DecodeYUV[2][2]);
+	return *this;
+}
+
+//! Sets color luminance
+Color& Color::set_y(const float &y) { return set_yuv(y,get_u(),get_v()); }
+
+//! Set U component of chromanance
+Color& Color::set_u(const float &u) { return set_yuv(get_y(),u,get_v()); }
+
+//! Set V component of chromanance
+Color& Color::set_v(const float &v) { return set_yuv(get_y(),get_u(),v); }
+
+//! Set the U and V components of chromanance
+Color& Color::set_uv(const float& u, const float& v) { return set_yuv(get_y(),u,v); }
+
+//! Sets the color's saturation
+/*!	\see get_s() */
+Color& Color::set_s(const float &x)
+{
+	float u(get_u()), v(get_v());
+	const float s(sqrt(u*u+v*v));
+	if(s)
+	{
+		u=(u/s)*x;
+		v=(v/s)*x;
+		return set_uv(u,v);
+	}
+	return *this;
+}
+
+//! YUV Color constructor
+Color Color::YUV(const float& y, const float& u, const float& v, const value_type& a)
+	{ return Color().set_yuv(y,u,v).set_a(a); }
+
+//! Returns the hue of the chromanance
+/*!	This is the angle of the U and V components.
+**	\see set_hue() */
+Angle Color::get_hue() const
+	{ return Angle::tan(get_u(),get_v()); }
+
+//! Synonym for get_hue(). \see get_hue()
+Angle Color::get_uv_angle() const { return get_hue(); }
+
+//! Sets the color's hue
+/*!	\see get_hue() */
+Color& Color::set_hue(const Angle& theta)
+{
+	const float s(get_s());
+	const float
+		u(s*(float)Angle::sin(theta).get()),
+		v(s*(float)Angle::cos(theta).get());
+	return set_uv(u,v);
+}
+
+//! Synonym for set_hue(). \see set_hue()
+Color& Color::set_uv_angle(const Angle& theta) { return set_hue(theta); }
+
+//! Rotates the chromanance vector by amount specified by \a theta
+Color& Color::rotate_uv(const Angle& theta)
+{
+	const float	a(Angle::sin(theta).get()),	b(Angle::cos(theta).get());
+	const float	u(get_u()),	v(get_v());
+
+	return set_uv(b*u-a*v,a*u+b*v);
+}
+
+Color& Color::set_yuv(const float& y, const float& s, const Angle& theta)
+{
+	return
+		set_yuv(
+			y,
+			s*(float)Angle::sin(theta).get(),
+			s*(float)Angle::cos(theta).get()
+		);
+}
+
+Color Color::YUV(const float& y, const float& s, const Angle& theta, const value_type& a)
+	{ return Color().set_yuv(y,s,theta).set_a(a); }
+
+
+
+/*protected:
+
+	value_type& operator[](const int i)
+	{
+		assert(i>=0);
+		assert(i<(signed)(sizeof(Color)/sizeof(value_type)));
+		return (&r_)[i];
+	}
+
+	const value_type& operator[](const int i)const
+	{
+		assert(i>=0);
+		assert(i<(signed)(sizeof(Color)/sizeof(value_type)));
+		return (&r_)[i];
+	}
+*/
+
+} // synfig namespace
+
+#endif // __SYNFIG_COLOR_COLOR_HPP
+
diff --git a/src/synfig/color/coloraccumulator.h b/src/synfig/color/coloraccumulator.h
new file mode 100644
index 0000000..be83bc5
--- /dev/null
+++ b/src/synfig/color/coloraccumulator.h
@@ -0,0 +1,180 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file
+**	\brief ColorAccumulator Class
+**
+**	$Id$
+**
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 2008 Chris Moore
+**	Copyright (c) 2012-2013 Carlos López
+**	Copyright (c) 2015 Diego Barrios Romero
+**
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
+**
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
+**	\endlegal
+*/
+/* ========================================================================= */
+
+#ifndef __SYNFIG_COLOR_COLORACUMULATOR_H
+#define __SYNFIG_COLOR_COLORACUMULATOR_H
+
+#include <synfig/color/color.h>
+
+namespace synfig {
+
+class ColorAccumulator
+{
+	friend class Color;
+public:
+	typedef float value_type;
+
+private:
+	value_type a_, r_, g_, b_;
+
+public:
+
+	ColorAccumulator &
+	operator+=(const ColorAccumulator &rhs)
+	{
+		r_+=rhs.r_;
+		g_+=rhs.g_;
+		b_+=rhs.b_;
+		a_+=rhs.a_;
+		return *this;
+	}
+
+	ColorAccumulator &
+	operator-=(const ColorAccumulator &rhs)
+	{
+		r_-=rhs.r_;
+		g_-=rhs.g_;
+		b_-=rhs.b_;
+		a_-=rhs.a_;
+		return *this;
+	}
+
+	ColorAccumulator &
+	operator*=(const float &rhs)
+	{
+		r_*=rhs;
+		g_*=rhs;
+		b_*=rhs;
+		a_*=rhs;
+		return *this;
+	}
+
+	ColorAccumulator &
+	operator/=(const float &rhs)
+	{
+		const float temp(value_type(1)/rhs);
+		r_*=temp;
+		g_*=temp;
+		b_*=temp;
+		a_*=temp;
+		return *this;
+	}
+
+	ColorAccumulator
+	operator+(const ColorAccumulator &rhs)const
+	{ return Color(*this)+=rhs; }
+
+	ColorAccumulator
+	operator-(const ColorAccumulator &rhs)const
+	{ return Color(*this)-=rhs; }
+
+	ColorAccumulator
+	operator*(const float &rhs)const
+	{ return Color(*this)*=rhs; }
+
+	ColorAccumulator
+	operator/(const float &rhs)const
+	{ return Color(*this)/=rhs; }
+
+	bool
+	operator==(const ColorAccumulator &rhs)const
+	{ return r_==rhs.r_ && g_==rhs.g_ && b_==rhs.b_ && a_!=rhs.a_; }
+
+	bool
+	operator!=(const ColorAccumulator &rhs)const
+	{ return r_!=rhs.r_ || g_!=rhs.g_ || b_!=rhs.b_ || a_!=rhs.a_; }
+
+	Color
+	operator-()const
+	{ return ColorAccumulator(-r_,-g_,-b_,-a_); }
+
+	bool is_valid()const
+	{ return !isnan(r_) && !isnan(g_) && !isnan(b_) && !isnan(a_); }
+
+public:
+	ColorAccumulator(): a_(), r_(), g_(), b_() { }
+
+	/*!	\param R Red
+	**	\param G Green
+	**	\param B Blue
+	**	\param A Opacity(alpha) */
+	ColorAccumulator(const value_type& R, const value_type& G, const value_type& B, const value_type& A=1):
+		a_(A),
+		r_(R),
+		g_(G),
+		b_(B) { }
+
+	//!	Copy constructor
+	ColorAccumulator(const ColorAccumulator& c):
+		a_(c.a_),
+		r_(c.r_),
+		g_(c.g_),
+		b_(c.b_) { }
+
+	//!	Converter
+	ColorAccumulator(const Color& c):
+		a_(c.a_),
+		r_(c.r_),
+		g_(c.g_),
+		b_(c.b_) { }
+
+	//! Converter
+	ColorAccumulator(int c): a_(c),r_(c), g_(c), b_(c) { }
+
+	//! Returns the RED component
+	const value_type& get_r()const { return r_; }
+
+	//! Returns the GREEN component
+	const value_type& get_g()const { return g_; }
+
+	//! Returns the BLUE component
+	const value_type& get_b()const { return b_; }
+
+	//! Returns the amount of opacity (alpha)
+	const value_type& get_a()const { return a_; }
+
+	//! Synonym for get_a(). \see get_a()
+	const value_type& get_alpha()const { return get_a(); }
+
+	//! Sets the RED component to \a x
+	ColorAccumulator& set_r(const value_type& x) { r_ = x; return *this; }
+
+	//! Sets the GREEN component to \a x
+	ColorAccumulator& set_g(const value_type& x) { g_ = x; return *this; }
+
+	//! Sets the BLUE component to \a x
+	ColorAccumulator& set_b(const value_type& x) { b_ = x; return *this; }
+
+	//! Sets the opacity (alpha) to \a x
+	ColorAccumulator& set_a(const value_type& x) { a_ = x; return *this; }
+
+	//! Synonym for set_a(). \see set_a()
+	ColorAccumulator& set_alpha(const value_type& x) { return set_a(x); }
+};
+
+
+} // synfig namespace
+
+#endif // __SYNFIG_COLOR_COLORACUMULATOR_H
diff --git a/src/synfig/color/colorblendingfunctions.h b/src/synfig/color/colorblendingfunctions.h
new file mode 100644
index 0000000..251e20d
--- /dev/null
+++ b/src/synfig/color/colorblendingfunctions.h
@@ -0,0 +1,347 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file
+**	\brief Color blending function implementation
+**
+**	$Id$
+**
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 2008 Chris Moore
+**	Copyright (c) 2012-2013 Carlos López
+**	Copyright (c) 2015 Diego Barrios Romero
+**
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
+**
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
+**	\endlegal
+*/
+/* ========================================================================= */
+
+#ifndef __SYNFIG_COLOR_COLORBLENDINGFUNCTIONS_H
+#define __SYNFIG_COLOR_COLORBLENDINGFUNCTIONS_H
+
+#define COLOR_EPSILON	(0.000001f)
+
+#include <synfig/color.h>
+
+namespace synfig {
+
+typedef Color (*blendfunc)(Color &,Color &,float);
+
+template <class C>
+C blendfunc_COMPOSITE(C &src,C &dest,float amount)
+{
+	//c_dest'=c_src+(1.0-a_src)*c_dest
+	//a_dest'=a_src+(1.0-a_src)*a_dest
+
+	float a_src=src.get_a()*amount;
+	float a_dest=dest.get_a();
+	const float one(C::ceil); 
+
+	// if a_arc==0.0
+	//if(fabsf(a_src)<COLOR_EPSILON) return dest;
+
+	// Scale the source and destination by their alpha values
+	src*=a_src;
+	dest*=a_dest;
+
+	dest=src + dest*(one-a_src);
+
+	a_dest=a_src + a_dest*(one-a_src);
+
+	// if a_dest!=0.0
+	if(fabsf(a_dest)>COLOR_EPSILON)
+	{
+		dest/=a_dest;
+		dest.set_a(a_dest);
+	}
+	else
+	{
+		dest=C::alpha();
+	}
+	assert(dest.is_valid());
+	return dest;
+}
+
+template <class C>
+C blendfunc_STRAIGHT(C &src,C &bg,float amount)
+{
+	//a_out'=(a_src-a_bg)*amount+a_bg
+	//c_out'=(((c_src*a_src)-(c_bg*a_bg))*amount+(c_bg*a_bg))/a_out'
+
+	// ie: if(amount==1.0)
+	//if(fabsf(amount-1.0f)<COLOR_EPSILON)return src;
+
+	C out;
+
+	float a_out((src.get_a()-bg.get_a())*amount+bg.get_a());
+
+	// if a_out!=0.0
+	if(fabsf(a_out)>COLOR_EPSILON)
+//	if(a_out>COLOR_EPSILON || a_out<-COLOR_EPSILON)
+	{
+		out=((src*src.get_a()-bg*bg.get_a())*amount+bg*bg.get_a())/a_out;
+		out.set_a(a_out);
+	}
+	else
+		out=C::alpha();
+
+	assert(out.is_valid());
+	return out;
+}
+
+template <class C>
+C blendfunc_ONTO(C &a,C &b,float amount)
+{
+	float alpha(b.get_a());
+	const float one(C::ceil);
+	return blendfunc_COMPOSITE(a,b.set_a(one),amount).set_a(alpha);
+}
+
+template <class C>
+C blendfunc_STRAIGHT_ONTO(C &a,C &b,float amount)
+{
+	a.set_a(a.get_a()*b.get_a());
+	return blendfunc_STRAIGHT(a,b,amount);
+}
+
+template <class C>
+C blendfunc_BRIGHTEN(C &a,C &b,float amount)
+{
+	const float alpha(a.get_a()*amount);
+
+	if(b.get_r()<a.get_r()*alpha)
+		b.set_r(a.get_r()*alpha);
+
+	if(b.get_g()<a.get_g()*alpha)
+		b.set_g(a.get_g()*alpha);
+
+	if(b.get_b()<a.get_b()*alpha)
+		b.set_b(a.get_b()*alpha);
+
+	return b;
+}
+
+template <class C>
+C blendfunc_DARKEN(C &a,C &b,float amount)
+{
+	const float alpha(a.get_a()*amount);
+	const float one(C::ceil);
+	
+	if(b.get_r()>(a.get_r()-one)*alpha+one)
+		b.set_r((a.get_r()-one)*alpha+one);
+
+	if(b.get_g()>(a.get_g()-one)*alpha+one)
+		b.set_g((a.get_g()-one)*alpha+one);
+
+	if(b.get_b()>(a.get_b()-one)*alpha+one)
+		b.set_b((a.get_b()-one)*alpha+one);
+
+
+	return b;
+}
+
+template <class C>
+C blendfunc_ADD(C &a,C &b,float amount)
+{
+	const float alpha(a.get_a()*amount);
+
+	b.set_r(b.get_r()+a.get_r()*alpha);
+	b.set_g(b.get_g()+a.get_g()*alpha);
+	b.set_b(b.get_b()+a.get_b()*alpha);
+
+	return b;
+}
+
+template <class C>
+C blendfunc_SUBTRACT(C &a,C &b,float amount)
+{
+	const float alpha(a.get_a()*amount);
+
+	b.set_r(b.get_r()-a.get_r()*alpha);
+	b.set_g(b.get_g()-a.get_g()*alpha);
+	b.set_b(b.get_b()-a.get_b()*alpha);
+
+	return b;
+}
+
+template <class C>
+C blendfunc_DIFFERENCE(C &a,C &b,float amount)
+{
+	const float alpha(a.get_a()*amount);
+
+	b.set_r(std::abs(b.get_r()-a.get_r()*alpha));
+	b.set_g(std::abs(b.get_g()-a.get_g()*alpha));
+	b.set_b(std::abs(b.get_b()-a.get_b()*alpha));
+
+	return b;
+}
+
+template <class C>
+C blendfunc_MULTIPLY(C &a,C &b,float amount)
+{
+	if(amount<0) a=~a, amount=-amount;
+
+	amount*=a.get_a();
+	b.set_r(((b.get_r()*a.get_r())-b.get_r())*(amount)+b.get_r());
+	b.set_g(((b.get_g()*a.get_g())-b.get_g())*(amount)+b.get_g());
+	b.set_b(((b.get_b()*a.get_b())-b.get_b())*(amount)+b.get_b());
+	return b;
+}
+
+template <class C>
+C blendfunc_DIVIDE(C &a,C &b,float amount)
+{
+	amount*=a.get_a();
+
+	// We add COLOR_EPSILON in order to avoid a divide-by-zero condition.
+	// This causes DIVIDE to bias toward positive values, but the effect is
+	// really negligible. There is a reason why we use COLOR_EPSILON--we
+	// want the change to be imperceptible.
+
+	b.set_r(((b.get_r()/(a.get_r()+COLOR_EPSILON))-b.get_r())*(amount)+b.get_r());
+	b.set_g(((b.get_g()/(a.get_g()+COLOR_EPSILON))-b.get_g())*(amount)+b.get_g());
+	b.set_b(((b.get_b()/(a.get_b()+COLOR_EPSILON))-b.get_b())*(amount)+b.get_b());
+
+	return b;
+}
+
+template <class C>
+C blendfunc_COLOR(C &a,C &b,float amount)
+{
+	C temp(b);
+	temp.set_uv(a.get_u(),a.get_v());
+	return (temp-b)*amount*a.get_a()+b;
+}
+
+template <class C>
+C blendfunc_HUE(C &a,C &b,float amount)
+{
+	C temp(b);
+	temp.set_hue(a.get_hue());
+	return (temp-b)*amount*a.get_a()+b;
+}
+
+template <class C>
+C blendfunc_SATURATION(C &a,C &b,float amount)
+{
+	C temp(b);
+	temp.set_s(a.get_s());
+	return (temp-b)*amount*a.get_a()+b;
+}
+
+template <class C>
+C blendfunc_LUMINANCE(C &a,C &b,float amount)
+{
+	C temp(b);
+	temp.set_y(a.get_y());
+	return (temp-b)*amount*a.get_a()+b;
+}
+
+template <class C>
+C blendfunc_BEHIND(C &a,C &b,float amount)
+{
+	if(a.get_a()==0)
+		a.set_a(COLOR_EPSILON*amount);		//!< \todo this is a hack
+	else
+		a.set_a(a.get_a()*amount);
+	return blendfunc_COMPOSITE(b,a,1.0);
+}
+
+template <class C>
+C blendfunc_ALPHA_BRIGHTEN(C &a,C &b,float amount)
+{
+	// \todo can this be right, multiplying amount by *b*'s alpha?
+	// compare with blendfunc_BRIGHTEN where it is multiplied by *a*'s
+	if(a.get_a() < b.get_a()*amount)
+		return a.set_a(a.get_a()*amount);
+	return b;
+}
+
+template <class C>
+C blendfunc_ALPHA_DARKEN(C &a,C &b,float amount)
+{
+	if(a.get_a()*amount > b.get_a())
+		return a.set_a(a.get_a()*amount);
+	return b;
+}
+
+template <class C>
+C blendfunc_SCREEN(C &a,C &b,float amount)
+{
+	const float one(C::ceil);
+	if(amount<0) a=~a, amount=-amount;
+
+	a.set_r(one-(one-a.get_r())*(one-b.get_r()));
+	a.set_g(one-(one-a.get_g())*(one-b.get_g()));
+	a.set_b(one-(one-a.get_b())*(one-b.get_b()));
+
+	return blendfunc_ONTO(a,b,amount);
+}
+
+template <class C>
+C blendfunc_OVERLAY(C &a,C &b,float amount)
+{
+	const float one(C::ceil);
+	if(amount<0) a=~a, amount=-amount;
+
+	C rm;
+	rm.set_r(b.get_r()*a.get_r());
+	rm.set_g(b.get_g()*a.get_g());
+	rm.set_b(b.get_b()*a.get_b());
+
+	C rs;
+	rs.set_r(one-(one-a.get_r())*(one-b.get_r()));
+	rs.set_g(one-(one-a.get_g())*(one-b.get_g()));
+	rs.set_b(one-(one-a.get_b())*(one-b.get_b()));
+
+	C& ret(a);
+
+	ret.set_r(a.get_r()*rs.get_r() + (one-a.get_r())*rm.get_r());
+	ret.set_g(a.get_g()*rs.get_g() + (one-a.get_g())*rm.get_g());
+	ret.set_b(a.get_b()*rs.get_b() + (one-a.get_b())*rm.get_b());
+
+	return blendfunc_ONTO(ret,b,amount);
+}
+
+
+template <class C>
+C blendfunc_HARD_LIGHT(C &a,C &b,float amount)
+{
+	const float one(C::ceil);
+	const float half((one-C::floor)/2);
+	if(amount<0) a=~a, amount=-amount;
+
+	if(a.get_r()>half)	a.set_r(one-(one-(a.get_r()*2*one-one))*(one-b.get_r()));
+	else				a.set_r(b.get_r()*(a.get_r()*2*one));
+	if(a.get_g()>half)	a.set_g(one-(one-(a.get_g()*2*one-one))*(one-b.get_g()));
+	else				a.set_g(b.get_g()*(a.get_g()*2*one));
+	if(a.get_b()>half)	a.set_b(one-(one-(a.get_b()*2*one-one))*(one-b.get_b()));
+	else				a.set_b(b.get_b()*(a.get_b()*2*one));
+
+	return blendfunc_ONTO(a,b,amount);
+}
+
+template <class C>
+C blendfunc_ALPHA_OVER(C &a,C &b,float amount)
+{
+	const float one(C::ceil);
+	C rm(b);
+
+	//multiply the inverse alpha channel with the one below us
+	rm.set_a((one-a.get_a())*b.get_a());
+
+	return blendfunc_STRAIGHT(rm,b,amount);
+}
+
+} // synfig namespace
+
+
+#endif // __SYNFIG_COLOR_COLORBLENDINGFUNCTIONS_H
+
diff --git a/src/synfig/color/common.h b/src/synfig/color/common.h
new file mode 100644
index 0000000..db0ffd7
--- /dev/null
+++ b/src/synfig/color/common.h
@@ -0,0 +1,91 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file
+**	\brief Common definitions for color classes
+**
+**	$Id$
+**
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 2008 Chris Moore
+**	Copyright (c) 2012-2013 Carlos López
+**	Copyright (c) 2015 Diego Barrios Romero
+**
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
+**
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
+**	\endlegal
+*/
+/* ========================================================================= */
+
+/* === S T A R T =========================================================== */
+
+#ifndef __SYNFIG_COLOR_COMMON_H
+#define __SYNFIG_COLOR_COMMON_H
+
+/* === H E A D E R S ======================================================= */
+
+#include <cmath>
+#include <stdint.h>
+#include <synfig/gamma.h>
+#include <synfig/string.h>
+#include <synfig/angle.h>
+
+#ifdef USE_HALF_TYPE
+#include <OpenEXR/half.h>
+#endif
+
+/* === M A C R O S ========================================================= */
+
+#define use_colorspace_gamma()	App::use_colorspace_gamma
+#define colorspace_gamma()		(2.2f)
+#define gamma_in(x)				((x>=0) ? pow((float)x,1.0f/colorspace_gamma()) : -pow((float)-x,1.0f/colorspace_gamma()))
+#define gamma_out(x)			((x>=0) ? pow((float)x,     colorspace_gamma()) : -pow((float)-x,     colorspace_gamma()))
+
+// For some reason isnan() isn't working on macosx any more.
+// This is a quick fix.
+#if defined(__APPLE__) && !defined(SYNFIG_ISNAN_FIX)
+    #ifdef isnan
+        #undef isnan
+    #endif
+    inline bool isnan(double x) { return x != x; }
+    inline bool isnan(float x) { return x != x; }
+    #define SYNFIG_ISNAN_FIX 1
+#else
+    #ifndef isnan
+        #define isnan(x) (std::isnan)(x)
+    #endif
+#endif
+
+namespace synfig {
+
+#ifdef USE_HALF_TYPE
+typedef half ColorReal;
+#else
+typedef float ColorReal;
+#endif
+
+static const float EncodeYUV[3][3]=
+{
+	{ 0.299f, 0.587f, 0.114f },
+	{ -0.168736f, -0.331264f, 0.5f },
+	{ 0.5f, -0.418688f, -0.081312f }
+};
+
+static const float DecodeYUV[3][3]=
+{
+	{ 1.0f, 0.0f, 1.402f },
+	{ 1.0f, -0.344136f, -0.714136f },
+	{ 1.0f, 1.772f, 0.0f }
+};
+
+
+} // synfig namespace 
+
+#endif // __SYNFIG_COLOR_COMMON_H
+
diff --git a/src/synfig/color/pixelformat.h b/src/synfig/color/pixelformat.h
new file mode 100644
index 0000000..dcadb97
--- /dev/null
+++ b/src/synfig/color/pixelformat.h
@@ -0,0 +1,283 @@
+/* === S Y N F I G ========================================================= */
+/*!    \file
+**    \brief PixelFormat and conversions
+**
+**    $Id$
+**
+**    \legal
+**    Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**    Copyright (c) 2007, 2008 Chris Moore
+**    Copyright (c) 2012-2013 Carlos López
+**    Copyright (c) 2015 Diego Barrios Romero
+**
+**    This package is free software; you can redistribute it and/or
+**    modify it under the terms of the GNU General Public License as
+**    published by the Free Software Foundation; either version 2 of
+**    the License, or (at your option) any later version.
+**
+**    This package is distributed in the hope that it will be useful,
+**    but WITHOUT ANY WARRANTY; without even the implied warranty of
+**    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**    General Public License for more details.
+**    \endlegal
+*/
+/* ========================================================================= */
+
+#ifndef __SYNFIG_COLOR_PIXELFORMAT_H
+#define __SYNFIG_COLOR_PIXELFORMAT_H
+
+#include <synfig/color/color.h>
+
+namespace synfig {
+
+
+enum PixelFormat
+{
+/* Bit    Descriptions (ON/OFF)
+** ----+-------------
+** 0    Color Channels (Gray/RGB)
+** 1    Alpha Channel (WITH/WITHOUT)
+** 2    ZDepth    (WITH/WITHOUT)
+** 3    Endian (BGR/RGB)
+** 4    Alpha Location (Start/End)
+** 5    ZDepth Location (Start/End)
+** 6    Alpha/ZDepth Arrangement (ZA,AZ)
+** 7    Alpha Range (Inverted,Normal)
+** 8    Z Range (Inverted,Normal)
+*/
+    PF_RGB       = 0,
+    PF_GRAY      = (1<<0), //!< If set, use one grayscale channel. If clear, use three channels for RGB
+    PF_A         = (1<<1), //!< If set, include alpha channel
+    PF_Z         = (1<<2), //!< If set, include ZDepth channel
+    PF_BGR       = (1<<3), //!< If set, reverse the order of the RGB channels
+    PF_A_START   = (1<<4), //!< If set, alpha channel is before the color data. If clear, it is after.
+    PF_Z_START   = (1<<5), //!< If set, ZDepth channel is before the color data. If clear, it is after.
+    PF_ZA        = (1<<6), //!< If set, the ZDepth channel will be in front of the alpha channel. If clear, they are reversed.
+    PF_A_INV     = (1<<7), //!< If set, the alpha channel is stored as 1.0-a
+    PF_Z_INV     = (1<<8), //!< If set, the ZDepth channel is stored as 1.0-z
+    PF_RAW_COLOR = (1<<9)+(1<<1) //!< If set, the data represents a raw Color data structure, and all other bits are ignored.
+};
+
+inline PixelFormat operator|(PixelFormat lhs, PixelFormat rhs)
+    { return static_cast<PixelFormat>((int)lhs|(int)rhs); }
+
+inline PixelFormat operator&(PixelFormat lhs, PixelFormat rhs)
+    { return static_cast<PixelFormat>((int)lhs&(int)rhs); }
+#define FLAGS(x,y)        (((x)&(y))==(y))
+
+//! Returns the number of channels that the given PixelFormat calls for
+inline int channels(const PixelFormat x)
+{
+    int chan = 0;
+    if(FLAGS(x, PF_GRAY))
+    {
+        ++chan;
+    }
+    else
+    {
+        chan += 3;
+    }
+
+    if(FLAGS(x, PF_A))
+    {
+        ++chan;
+    }
+    if(FLAGS(x, PF_Z))
+    {
+        ++chan;
+    }
+    if(FLAGS(x, PF_RAW_COLOR))
+    {
+        chan = sizeof(Color);
+    }
+
+    return chan;
+}
+
+inline unsigned char * Color2PixelFormat(const Color &color, const PixelFormat &pf,
+                                         unsigned char *out, const Gamma &gamma)
+{
+    if(FLAGS(pf, PF_RAW_COLOR))
+    {
+        Color *outcol = reinterpret_cast<Color *>(out);
+        *outcol = color;
+        out += sizeof(color);
+        return out;
+    }
+
+    int alpha = 0;
+    if (FLAGS(pf, PF_A_INV))
+    {
+        alpha = (-(float)color.get_a()+1) * 255;
+    }
+    else
+    {
+        alpha = (float)color.get_a() * 255;
+    }
+
+    if(alpha < 0)
+    {
+        alpha=0;
+    }
+    if(alpha > 255)
+    {
+        alpha=255;
+    }
+
+    if(FLAGS(pf, PF_ZA|PF_A_START|PF_Z_START))
+    {
+        if(FLAGS(pf, PF_Z_START))
+        {
+            out++;
+        }
+        if(FLAGS(pf, PF_A_START))
+        {
+            *out++ = static_cast<unsigned char>(alpha);
+        }
+    }
+    else
+    {
+        if(FLAGS(pf, PF_A_START))
+        {
+            *out++ = static_cast<unsigned char>(alpha);
+        }
+        if(FLAGS(pf, PF_Z_START))
+        {
+            out++;
+        }
+    }
+
+    if(FLAGS(pf,PF_GRAY))
+    {
+        *out++ = static_cast<unsigned char>(gamma.g_F32_to_U8(color.get_y()));
+    }
+    else
+    {
+        if(FLAGS(pf,PF_BGR))
+        {
+            *out++ = static_cast<unsigned char>(gamma.r_F32_to_U8(color.get_b()));
+            *out++ = static_cast<unsigned char>(gamma.g_F32_to_U8(color.get_g()));
+            *out++ = static_cast<unsigned char>(gamma.b_F32_to_U8(color.get_r()));
+        }
+        else
+        {
+            *out++ = static_cast<unsigned char>(gamma.r_F32_to_U8(color.get_r()));
+            *out++ = static_cast<unsigned char>(gamma.g_F32_to_U8(color.get_g()));
+            *out++ = static_cast<unsigned char>(gamma.b_F32_to_U8(color.get_b()));
+        }
+    }
+
+    if(FLAGS(pf, PF_ZA))
+    {
+        if(!FLAGS(pf, PF_Z_START) && FLAGS(pf, PF_Z))
+        {
+            out++;
+        }
+        if(!FLAGS(pf, PF_A_START) && FLAGS(pf, PF_A))
+        {
+            *out++ = static_cast<unsigned char>(alpha);
+        }
+    }
+    else
+    {
+        if(!FLAGS(pf, PF_Z_START) && FLAGS(pf, PF_Z))
+        {
+            out++;
+        }
+        if(!FLAGS(pf, PF_A_START) && FLAGS(pf, PF_A))
+        {
+            *out++ = static_cast<unsigned char>(alpha);
+        }
+    }
+
+    return out;
+}
+
+inline void convert_color_format(unsigned char *dest, const Color *src,
+                                 int w, PixelFormat pf,const Gamma &gamma)
+{
+    assert(w >= 0);
+    while(w--)
+    {
+        dest = Color2PixelFormat((*(src++)).clamped(),
+                                 pf, dest, gamma);
+    }
+}
+
+inline const unsigned char * PixelFormat2Color(Color &color,
+                                               const PixelFormat &pf,
+                                               const unsigned char *out)
+{
+    if(FLAGS(pf, PF_ZA|PF_A_START|PF_Z_START))
+    {
+        if(FLAGS(pf, PF_Z_START))
+        {
+            out++;
+        }
+        if(FLAGS(pf,PF_A_START))
+        {
+            color.set_a((float)*out++ / 255);
+        }
+    }
+    else
+    {
+        if(FLAGS(pf, PF_A_START))
+        {
+            color.set_a((float)*out++ / 255);
+        }
+        if(FLAGS(pf, PF_Z_START))
+        {
+            out++;
+        }
+    }
+
+    if(FLAGS(pf, PF_GRAY))
+    {
+        color.set_yuv((float)*out++ / 255, 0, 0);
+    }
+    else
+    {
+        if(FLAGS(pf, PF_BGR))
+        {
+            color.set_b((float)*out++ / 255);
+            color.set_g((float)*out++ / 255);
+            color.set_r((float)*out++ / 255);
+        }
+        else
+        {
+            color.set_r((float)*out++ / 255);
+            color.set_g((float)*out++ / 255);
+            color.set_b((float)*out++ / 255);
+        }
+    }
+
+    if(FLAGS(pf, PF_ZA))
+    {
+        if(!FLAGS(pf, PF_Z_START) && FLAGS(pf, PF_Z))
+        {
+            out++;
+        }
+        if(!FLAGS(pf, PF_A_START) && FLAGS(pf, PF_A))
+        {
+            color.set_a((float)*out++ / 255);
+        }
+    }
+    else
+    {
+        if(!FLAGS(pf, PF_A_START) && FLAGS(pf, PF_A))
+        {
+            color.set_a((float)*out++ / 255);
+        }
+        if(!FLAGS(pf, PF_Z_START) && FLAGS(pf, PF_Z))
+        {
+            out++;
+        }
+    }
+
+    return out;
+}
+
+} // synfig namespace
+
+#endif // __SYNFIG_COLOR_PIXELFORMAT_H
+
diff --git a/src/synfig/context.cpp b/src/synfig/context.cpp
index 7204213..ae1dd92 100644
--- a/src/synfig/context.cpp
+++ b/src/synfig/context.cpp
@@ -33,7 +33,7 @@
 
 #include "context.h"
 #include "layer.h"
-#include "layer_pastecanvas.h"
+#include <synfig/layers/layer_pastecanvas.h>
 #include "string.h"
 #include "vector.h"
 #include "color.h"
diff --git a/src/synfig/context.h b/src/synfig/context.h
index 46b9d0f..f4bbc66 100644
--- a/src/synfig/context.h
+++ b/src/synfig/context.h
@@ -32,7 +32,7 @@
 #include "rect.h"
 #include "renddesc.h"
 #include "surface.h"
-#include "layer_composite.h"
+#include <synfig/layers/layer_composite.h>
 #include "general.h"
 
 /* === M A C R O S ========================================================= */
diff --git a/src/synfig/filecontainerzip.cpp b/src/synfig/filecontainerzip.cpp
index 14cc9d0..1dde507 100644
--- a/src/synfig/filecontainerzip.cpp
+++ b/src/synfig/filecontainerzip.cpp
@@ -1,834 +1,834 @@
-/* === S Y N F I G ========================================================= */
-/*!	\file filecontainerzip.cpp
-**	\brief FileContainerZip
-**
-**	$Id$
-**
-**	\legal
-**	......... ... 2013 Ivan Mahonin
-**
-**	This package is free software; you can redistribute it and/or
-**	modify it under the terms of the GNU General Public License as
-**	published by the Free Software Foundation; either version 2 of
-**	the License, or (at your option) any later version.
-**
-**	This package is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-**	General Public License for more details.
-**	\endlegal
-*/
-/* ========================================================================= */
-
-/* === H E A D E R S ======================================================= */
-
-#ifdef USING_PCH
-#	include "pch.h"
-#else
-#ifdef HAVE_CONFIG_H
-#	include <config.h>
-#endif
-
-#include <cstring>
-#include <stdint.h>
-#include <cstddef>
-#include <ETL/stringf>
-#include <libxml++/libxml++.h>
-#include "filecontainerzip.h"
-
-#endif
-
-/* === U S I N G =========================================================== */
-
-using namespace std;
-using namespace etl;
-using namespace synfig;
-
-/* === M A C R O S ========================================================= */
-
-/* === G L O B A L S ======================================================= */
-
-/* === P R O C E D U R E S ================================================= */
-
-/* === M E T H O D S ======================================================= */
-
-namespace synfig
-{
-	namespace FileContainerZip_InternalStructs
-	{
-
-		#pragma pack(push, 1)
-
-		struct DOSTimestamp
-		{
-			uint16_t dos_time;
-			uint16_t dos_date;
-
-			inline DOSTimestamp():
-				dos_time(0), dos_date(0) { }
-
-			inline explicit DOSTimestamp(uint16_t dos_time, uint16_t dos_date):
-				dos_time(dos_time), dos_date(dos_date) { }
-
-			inline explicit DOSTimestamp(time_t time)
-			{
-				tm *t = localtime(&time);
-				dos_time = ((t->tm_sec  & 0x3f) >>  1)
-						 | ((t->tm_min  & 0x3f) <<  5)
-						 | ((t->tm_hour & 0x1f) << 11);
-				dos_date = ((t->tm_mday & 0x1f) <<  0)
-						 | ((t->tm_mon  & 0x0f) <<  5)
-						 | ((t->tm_year & 0x7f) <<  9);
-			}
-
-			inline time_t get_time()
-			{
-				tm t;
-				memset(&t, 0, sizeof(t));
-				t.tm_sec  = (dos_time <<  1) & 0x3f;
-				t.tm_min  = (dos_time >>  5) & 0x3f;
-				t.tm_hour = (dos_time >> 11) & 0x1f;
-				t.tm_mday = (dos_time >>  0) & 0x1f;
-				t.tm_mon  = (dos_time >>  5) & 0x0f;
-				t.tm_year = (dos_time >>  9) & 0x7f;
-				return mktime(&t);
-			}
-		};
-
-		struct LocalFileHeader
-		{
-			enum { valid_signature__ = 0x04034b50 };
-
-			uint32_t signature;			//!< Local file header signature = 0x04034b50 (read as a little-endian number)
-			uint16_t version;			//!< Version needed to extract (minimum)
-			uint16_t flags;				//!< General purpose bit flag
-			uint16_t compression;		//!< Compression method
-			uint16_t modification_time;	//!< File last modification time
-			uint16_t modification_date; //!< File last modification date
-			uint32_t crc32;				//!< CRC-32
-			uint32_t compressed_size;	//!< Compressed size
-			uint32_t uncompressed_size;	//!< Uncompressed size
-			uint16_t filename_length;	//!< File name length (n)
-			uint16_t extrafield_length; //!< Extra field length (m)
-			// next:
-			//   filename - n bytes
-			//   extrafield - m bytes
-			//   file data
-			//   optional LocalFileDataDescriptor (if bit 3 (0x08) set in flags)
-
-			inline LocalFileHeader()
-			{
-				memset(this, 0, sizeof(*this));
-				signature = valid_signature__;
-			}
-		};
-
-		struct LocalFileHeaderOverwrite
-		{
-			uint32_t crc32;				//!< CRC-32
-			uint32_t compressed_size;	//!< Compressed size
-			uint32_t uncompressed_size;	//!< Uncompressed size
-
-			inline LocalFileHeaderOverwrite()
-			{
-				memset(this, 0, sizeof(*this));
-			}
-
-			inline static size_t offset_from_header()
-			{
-				const static LocalFileHeader dummy;
-				return (size_t)((const char *)&dummy.crc32 - (const char *)&dummy);
-			}
-		};
-
-		struct CentralDirectoryFileHeader
-		{
-			enum { valid_signature__ = 0x02014b50 };
-
-			uint32_t signature;			//!< Central directory file header signature = 0x02014b50
-			uint16_t version;			//!< Version made by
-			uint16_t min_version;		//!< Version needed to extract (minimum)
-			uint16_t flags;				//!< General purpose bit flag
-			uint16_t compression;		//!< Compression method
-			uint16_t modification_time;	//!< File last modification time
-			uint16_t modification_date; //!< File last modification date
-			uint32_t crc32;				//!< CRC-32
-			uint32_t compressed_size;	//!< Compressed size
-			uint32_t uncompressed_size;	//!< Uncompressed size
-			uint16_t filename_length;	//!< File name length (n)
-			uint16_t extrafield_length;	//!< Extra field length (m)
-			uint16_t filecomment_length;//!< File comment length (k)
-			uint16_t disk_number;		//!< Disk number where file starts
-			uint16_t internal_attrs;	//!< Internal file attributes
-			uint32_t external_attrs;	//!< External file attributes
-			uint32_t offset;			//!< Relative offset of local file header.
-										//!< This is the number of bytes between the
-										//!< start of the first disk on which the
-										//!< file occurs, and the start of the local
-										//!< file header. This allows software reading
-										//!< the central directory to locate the
-										//!< position of the file inside the .ZIP file.
-			// next:
-			//   filename - n bytes
-			//   extrafield - m bytes
-			//   filecomment - k bytes
-			//   next CentralDirectorySignature
-
-			inline CentralDirectoryFileHeader()
-			{
-				memset(this, 0, sizeof(*this));
-				signature = valid_signature__;
-			}
-		};
-
-		struct EndOfCentralDirectory
-		{
-			enum { valid_signature__ = 0x06054b50 };
-
-			uint32_t signature;			//!< End of central directory signature = 0x06054b50
-			uint16_t current_disk;		//!< Number of this disk
-			uint16_t first_disk;		//!< Disk where central directory starts
-			uint16_t current_records;	//!< Number of central directory records on this disk
-			uint16_t total_records;		//!< Total number of central directory records
-			uint32_t size;				//!< Size of central directory (bytes)
-			uint32_t offset;			//!< Offset of start of central directory, relative to start of archive
-			uint16_t comment_length;	//!< Comment length (n)
-			// next:
-			//   comment - n bytes
-			//   end of file
-
-			inline EndOfCentralDirectory()
-			{
-				memset(this, 0, sizeof(*this));
-				signature = valid_signature__;
-			}
-		};
-
-		#pragma pack(pop)
-	}
-}
-
-using namespace synfig::FileContainerZip_InternalStructs;
-
-void FileContainerZip::FileInfo::split_name()
-{
-	size_t pos = name.rfind('/');
-	if (pos == std::string::npos || pos == 0)
-	{
-		name_part_directory.clear();
-		name_part_localname = name;
-	}
-	else
-	{
-		name_part_directory = name.substr(0, pos);
-		name_part_localname = name.substr(pos + 1);
-	}
-}
-
-FileContainerZip::FileContainerZip():
-storage_file_(NULL),
-prev_storage_size_(0),
-file_reading_whole_container_(false),
-file_reading_(false),
-file_writing_(false),
-file_processed_size_(0),
-changed_(false)
-{ }
-
-FileContainerZip::~FileContainerZip() { close(); }
-
-unsigned int FileContainerZip::crc32(unsigned int previous_crc, const void *buffer, size_t size)
-{
-	static const unsigned int table[] = {
-	    0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
-	    0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
-	    0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
-	    0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
-	    0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
-	    0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
-	    0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
-	    0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
-	    0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
-	    0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
-	    0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
-	    0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
-	    0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
-	    0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
-	    0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
-	    0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
-	    0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
-	    0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
-	    0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
-	    0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
-	    0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
-	    0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
-	    0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
-	    0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
-	    0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
-	    0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
-	    0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
-	    0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
-	    0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
-	    0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
-	    0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
-	    0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
-	};
-
-	unsigned int crc = previous_crc ^ 0xFFFFFFFFUL;
-	unsigned char *char_buf = (unsigned char *)buffer;
-	size_t remain = size;
-	while (remain--)
-		crc = table[(crc ^ *char_buf++) & 0xFF] ^ (crc >> 8);
-	return crc ^ 0xFFFFFFFFUL;
-}
-
-std::string FileContainerZip::encode_history(const FileContainerZip::HistoryRecord &history_record)
-{
-	xmlpp::Document document;
-	document.
-		create_root_node("history")->
-		add_child("prev_storage_size")->
-		set_child_text(strprintf("%lld", history_record.prev_storage_size));
-	return document.write_to_string_formatted();
-}
-
-FileContainerZip::HistoryRecord FileContainerZip::decode_history(const std::string &comment)
-{
-	HistoryRecord history_record;
-	xmlpp::DomParser parser;
-	parser.parse_memory(comment);
-	if(parser)
-	{
-		xmlpp::Element *root = parser.get_document()->get_root_node();
-		if (root->get_name() == "history")
-		{
-			xmlpp::Element::NodeList list = root->get_children();
-			for(xmlpp::Element::NodeList::iterator i = list.begin(); i != list.end(); i++)
-			{
-				if ((*i)->get_name() == "prev_storage_size")
-				{
-					std::string s;
-					xmlpp::Element::NodeList list = (*i)->get_children();
-					for(xmlpp::Element::NodeList::iterator j = list.begin(); j != list.end(); j++)
-						if (dynamic_cast<xmlpp::TextNode*>(*j))
-							s += dynamic_cast<xmlpp::TextNode*>(*j)->get_content();
-					history_record.prev_storage_size = strtoll(s.c_str(), NULL, 10);
-					if (history_record.prev_storage_size < 0)
-						history_record.prev_storage_size = 0;
-				}
-			}
-		}
-	}
-	return history_record;
-}
-
-void FileContainerZip::read_history(std::list<HistoryRecord> &list, FILE *f, file_size_t size)
-{
-	if (size < (long int)sizeof(EndOfCentralDirectory))
-		return;
-
-	// search "end of central directory" record
-
-	char buffer[(1 << 16) + sizeof(EndOfCentralDirectory)];
-	std::string comment;
-	size_t read_size = size > (long int)sizeof(buffer)
-					 ? sizeof(buffer) : (size_t)size;
-	fseek(f, (long int)size - (long int)read_size, SEEK_SET);
-	read_size = fread(&buffer, 1, read_size, f);
-	bool found = false;
-	HistoryRecord history_record;
-
-	for(int i = read_size - sizeof(EndOfCentralDirectory); i >= 0; i--)
-	{
-		EndOfCentralDirectory *e = (EndOfCentralDirectory*)&buffer[i];
-		if (e->signature == EndOfCentralDirectory::valid_signature__
-		 && e->comment_length == (uint16_t)(read_size - sizeof(EndOfCentralDirectory) - i))
-		{
-			// found
-			if (e->comment_length > 0)
-			{
-				comment = std::string(buffer + i + sizeof(EndOfCentralDirectory), e->comment_length);
-				history_record = decode_history(comment);
-				history_record.storage_size = size;
-				found = true;
-			}
-			break;
-		}
-	}
-
-	if (found)
-	{
-		list.front() = history_record;
-		if (history_record.prev_storage_size > 0 && history_record.prev_storage_size < size) {
-			list.push_front(HistoryRecord(0, history_record.prev_storage_size));
-			read_history(list, f, history_record.prev_storage_size);
-		}
-	}
-}
-
-std::list<FileContainerZip::HistoryRecord> FileContainerZip::read_history(const std::string &container_filename)
-{
-	std::list<HistoryRecord> list;
-
-	FILE *f = fopen(container_filename.c_str(), "rb");
-	if (f == NULL) return list;
-
-	fseek(f, 0, SEEK_END);
-	long int size = ftell(f);
-	if (size >= (long int)sizeof(EndOfCentralDirectory))
-	{
-		list.push_front(HistoryRecord(0, size));
-		read_history(list, f, size);
-	}
-
-	fclose(f);
-	return list;
-}
-
-bool FileContainerZip::create(const std::string &container_filename)
-{
-	if (is_opened()) return false;
-	storage_file_ = fopen(fix_slashes(container_filename).c_str(), "w+b");
-	if (is_opened()) changed_ = true;
-	return is_opened();
-}
-
-bool FileContainerZip::open_from_history(const std::string &container_filename, file_size_t truncate_storage_size) {
-	if (is_opened()) return false;
-	FILE *f = fopen(fix_slashes(container_filename).c_str(), "r+b");
-	if (f == NULL) return false;
-
-	// check size of file
-	fseek(f, 0, SEEK_END);
-	long int filesize = ftell(f);
-	long int actual_filesize = filesize;
-	if (filesize < (long int)sizeof(EndOfCentralDirectory))
-		{ fclose(f); return false; }
-
-	if (truncate_storage_size > 0 && truncate_storage_size < filesize)
-		filesize = (long int)truncate_storage_size;
-
-	char buffer[(1 << 16) + sizeof(EndOfCentralDirectory)];
-
-	// search "end of central directory" record
-	EndOfCentralDirectory ecd;
-	size_t read_size = filesize > (long int)sizeof(buffer)
-					 ? sizeof(buffer) : (size_t)filesize;
-	fseek(f, filesize - (long int)read_size, SEEK_SET);
-	read_size = fread(&buffer, 1, read_size, f);
-	bool found = false;
-	for(int i = read_size - sizeof(EndOfCentralDirectory); i >= 0; i--)
-	{
-		EndOfCentralDirectory *e = (EndOfCentralDirectory*)&buffer[i];
-		if (e->signature == EndOfCentralDirectory::valid_signature__
-		 && e->comment_length == (uint16_t)(read_size - sizeof(EndOfCentralDirectory) - i))
-		{
-			ecd = *e;
-			found = true;
-			break;
-		}
-	}
-	if (!found)
-		{ fclose(f); return false; }
-
-	// read "central directory"
-	FileMap files;
-	fseek(f, ecd.offset, SEEK_SET);
-	for(int i = 0; i < ecd.current_records; i++)
-	{
-		CentralDirectoryFileHeader cdfh;
-		if (sizeof(cdfh) != fread(&cdfh, 1, sizeof(cdfh), f))
-			{ fclose(f); return false; }
-
-		// read name, comment and extrafield
-		size_t extra_size = cdfh.filename_length
-		                  + cdfh.filecomment_length
-		                  + cdfh.extrafield_length;
-		if (extra_size != fread(buffer, 1, extra_size, f))
-			{ fclose(f); return false; }
-
-		if (cdfh.filename_length > 0
-		 && (cdfh.flags & 0x0071) == 0
-		 && cdfh.compression == 0)
-		{
-			FileInfo info;
-			if (buffer[cdfh.filename_length - 1] == '/')
-			{
-				info.name = std::string(buffer, buffer + cdfh.filename_length - 1);
-				info.is_directory = true;
-			}
-			else
-			{
-				info.name = std::string(buffer, buffer + cdfh.filename_length);
-			}
-
-			info.directory_saved = info.is_directory;
-			info.size = cdfh.compressed_size;
-			info.header_offset = cdfh.offset;
-			info.crc32 = cdfh.crc32;
-			info.time = DOSTimestamp(cdfh.modification_time, cdfh.modification_date).get_time();
-			info.split_name();
-			files[info.name] = info;
-		}
-	}
-
-	// create directories
-	for(FileMap::iterator i = files.begin(); i != files.end();)
-	{
-		if (!i->second.name_part_directory.empty()
-		 && files.find( i->second.name_part_directory ) == files.end())
-		{
-			FileInfo info;
-			info.name = i->second.name_part_directory;
-			info.is_directory = true;
-			info.time = time(NULL);
-			info.split_name();
-			files[ info.name ] = info;
-			i = files.begin();
-		}
-		else i++;
-	}
-
-	// loaded
-	fseek(f, 0, SEEK_END);
-	storage_file_ = f;
-	files_.swap( files );
-	prev_storage_size_ = actual_filesize;
-	file_reading_ = false;
-	file_writing_ = false;
-	changed_ = false;
-	return true;
-}
-
-bool FileContainerZip::open(const std::string &container_filename)
-{
-	return open_from_history(container_filename);
-}
-
-bool FileContainerZip::save()
-{
-	if (file_is_opened()) return false;
-	if (!changed_) return true;
-
-	fseek(storage_file_, 0, SEEK_END);
-
-	// write headers of new directories
-	for(FileMap::iterator i = files_.begin(); i != files_.end(); i++)
-	{
-		FileInfo &info = i->second;
-		if (info.is_directory && !info.directory_saved)
-		{
-			LocalFileHeader lfh;
-			lfh.version = 20;
-			lfh.filename_length = info.name.size() + 1;
-			DOSTimestamp dos_timestamp(info.time);
-			lfh.modification_time = dos_timestamp.dos_time;
-			lfh.modification_date = dos_timestamp.dos_date;
-
-			info.header_offset = ftell(storage_file_);
-			if (sizeof(lfh) != fwrite(&lfh, 1, sizeof(lfh), storage_file_))
-				return false;
-			if (info.name.size() != fwrite(info.name.c_str(), 1, info.name.size(), storage_file_))
-				return false;
-			if ((int)'/' != fputc('/', storage_file_))
-				return false;
-
-			info.directory_saved = true;
-		}
-	}
-
-	// write central directory
-	uint32_t central_directory_offset = (uint32_t)ftell(storage_file_);
-	for(FileMap::iterator i = files_.begin(); i != files_.end(); i++)
-	{
-		FileInfo &info = i->second;
-		CentralDirectoryFileHeader cdfh;
-		cdfh.min_version = 20;
-		cdfh.offset = info.header_offset;
-		cdfh.compressed_size = cdfh.uncompressed_size = info.size;
-		cdfh.crc32 = info.crc32;
-		cdfh.filename_length = (uint16_t)info.name.size();
-		if (info.is_directory)
-			cdfh.filename_length++;
-		DOSTimestamp dos_timestamp(info.time);
-		cdfh.modification_time = dos_timestamp.dos_time;
-		cdfh.modification_date = dos_timestamp.dos_date;
-
-		// write header
-		if (sizeof(cdfh) != fwrite(&cdfh, 1, sizeof(cdfh), storage_file_))
-			return false;
-
-		// write name
-		if (info.name.size() != fwrite(info.name.c_str(), 1, info.name.size(), storage_file_))
-			return false;
-		if (info.is_directory)
-			if ((int)'/' != fputc('/', storage_file_))
-				return false;
-	}
-
-	// end of central directory
-	EndOfCentralDirectory ecd;
-	ecd.offset = central_directory_offset;
-	ecd.current_records = ecd.total_records = files_.size();
-	ecd.size = ftell(storage_file_) - central_directory_offset;
-	std::string comment = encode_history(HistoryRecord(prev_storage_size_));
-	ecd.comment_length = comment.size();
-
-	// write header
-	if (sizeof(ecd) != fwrite(&ecd, 1, sizeof(ecd), storage_file_))
-		return false;
-
-	// write comment
-	if (ecd.comment_length > 0
-	 && ecd.comment_length != fwrite(comment.c_str(), 1, ecd.comment_length, storage_file_))
-	{
-		return false;
-	}
-
-	prev_storage_size_ = ftell(storage_file_);
-	fflush(storage_file_);
-	changed_ = false;
-	return true;
-}
-
-void FileContainerZip::close()
-{
-	if (!is_opened()) return;
-
-	// close opened file if need
-	file_close();
-
-	save();
-
-	// close storage file and clead variables
-	fclose(storage_file_);
-	storage_file_ = NULL;
-	files_.clear();
-	prev_storage_size_ = 0;
-	file_reading_ = false;
-	file_writing_ = false;
-	changed_ = false;
-}
-
-bool FileContainerZip::is_opened()
-{
-	return storage_file_ != NULL;
-}
-
-bool FileContainerZip::is_file(const std::string &filename)
-{
-	if (!is_opened()) return false;
-	FileMap::const_iterator i = files_.find(fix_slashes(filename));
-	return i != files_.end() && !i->second.is_directory;
-}
-
-bool FileContainerZip::is_directory(const std::string &filename)
-{
-	if (!is_opened()) return false;
-	if (filename.empty()) return true;
-	FileMap::const_iterator i = files_.find(fix_slashes(filename));
-	return i != files_.end() && i->second.is_directory;
-}
-
-bool FileContainerZip::directory_check_name(const std::string &dirname)
-{
-	return dirname.size() <= (1 << 16) - 2 - sizeof(CentralDirectoryFileHeader);
-}
-
-bool FileContainerZip::directory_create(const std::string &dirname)
-{
-	if (!is_opened()) return false;
-	if (is_file(dirname)) return false;
-	if (is_directory(dirname)) return true;
-	if (!directory_check_name(dirname)) return false;
-
-	FileInfo info;
-	info.name = fix_slashes(dirname);
-	info.split_name();
-	info.is_directory = true;
-	info.time = time(NULL);
-	if (info.name_part_localname.empty()
-	 || !is_directory(info.name_part_directory)) return false;
-
-	changed_ = true;
-	files_[info.name] = info;
-	return true;
-}
-
-bool FileContainerZip::directory_scan(const std::string &dirname, std::list< std::string > &out_files)
-{
-	out_files.clear();
-	if (!is_directory(dirname)) return false;
-	for(FileMap::iterator i = files_.begin(); i != files_.end(); i++)
-		if (i->second.name_part_directory == fix_slashes(dirname))
-			out_files.push_back(i->second.name_part_localname);
-	return true;
-}
-
-bool FileContainerZip::file_remove(const std::string &filename)
-{
-	if (is_directory(filename))
-	{
-		std::list< std::string > files;
-		directory_scan(filename, files);
-		if (!files.empty()) return false;
-		changed_ = true;
-		files_.erase(fix_slashes(filename));
-	}
-	else
-	if (is_file(filename))
-	{
-		if (file_is_opened() && file_->first == fix_slashes(filename))
-			return false;
-		changed_ = true;
-		files_.erase(fix_slashes(filename));
-	}
-	return true;
-}
-
-bool FileContainerZip::file_check_name(const std::string &filename)
-{
-	return filename.size() <= (1 << 16) - 1 - sizeof(CentralDirectoryFileHeader);
-}
-
-bool FileContainerZip::file_open_read_whole_container()
-{
-	if (!is_opened() || file_is_opened()) return false;
-	fseek(storage_file_, 0, SEEK_SET);
-	file_reading_whole_container_ = true;
-	file_processed_size_ = 0;
-	return true;
-}
-
-bool FileContainerZip::file_open_read(const std::string &filename)
-{
-	if (!is_opened() || file_is_opened()) return false;
-	file_ = files_.find(fix_slashes(filename));
-	if (file_ == files_.end() || file_->second.is_directory)
-		return false;
-
-	// read header
-	LocalFileHeader lfh;
-	fseek(storage_file_, file_->second.header_offset, SEEK_SET);
-	if (sizeof(lfh) != fread(&lfh, 1, sizeof(lfh), storage_file_))
-		return false;
-	if (lfh.signature != LocalFileHeader::valid_signature__)
-		return false;
-
-	// seek to file begin
-	fseek(storage_file_, lfh.filename_length + lfh.extrafield_length, SEEK_CUR);
-	file_reading_ = true;
-	file_processed_size_ = 0;
-	return true;
-}
-
-bool FileContainerZip::file_open_write(const std::string &filename)
-{
-	if (!is_opened() || file_is_opened()) return false;
-	if (!file_check_name(filename)) return false;
-
-	file_ = files_.find(fix_slashes(filename));
-
-	FileInfo new_info;
-	if (file_ == files_.end())
-	{
-		// create new file
-		new_info.name = fix_slashes(filename);
-		new_info.split_name();
-		if (new_info.name_part_localname.empty()
-		 || !is_directory(new_info.name_part_directory)) return false;
-	}
-	else
-	if (file_->second.is_directory)
-		return false;
-
-	FileInfo &info = file_ == files_.end() ? new_info : file_->second;
-
-	// write header
-	LocalFileHeader lfh;
-	time_t t = time(NULL);
-	lfh.version = 20;
-	lfh.filename_length = info.name.size();
-	DOSTimestamp dos_timestamp(t);
-	lfh.modification_time = dos_timestamp.dos_time;
-	lfh.modification_date = dos_timestamp.dos_date;
-
-	fseek(storage_file_, 0, SEEK_END);
-	long int offset = ftell(storage_file_);
-	changed_ = true;
-	if (sizeof(lfh) != fwrite(&lfh, 1, sizeof(lfh), storage_file_))
-		return false;
-	if (info.name.size() != fwrite(info.name.c_str(), 1, info.name.size(), storage_file_))
-		return false;
-
-	// update file info
-	info.header_offset = offset;
-	info.size = 0;
-	info.crc32 = 0;
-	info.time = t;
-	if (file_ == files_.end())
-	{
-		files_[new_info.name] = new_info;
-		file_ = files_.find(fix_slashes(filename));
-	}
-	file_writing_ = true;
-	file_processed_size_ = 0;
-	return true;
-}
-
-void FileContainerZip::file_close()
-{
-	if (file_is_opened_for_write())
-	{
-		LocalFileHeaderOverwrite lfho;
-		lfho.crc32 = file_->second.crc32;
-		lfho.compressed_size = lfho.uncompressed_size = file_->second.size;
-		fseek(storage_file_, file_->second.header_offset + LocalFileHeaderOverwrite::offset_from_header(), SEEK_SET);
-		fwrite(&lfho, 1, sizeof(lfho), storage_file_);
-		file_writing_ = false;
-		fflush(storage_file_);
-	}
-	file_reading_whole_container_ = false;
-	file_reading_ = false;
-	file_writing_ = false;
-	file_processed_size_ = 0;
-
-	// call base-class method to invalidate streams
-	FileContainer::file_close();
-}
-
-bool FileContainerZip::file_is_opened_for_read()
-{
-	return is_opened() && (file_reading_ || file_reading_whole_container_);
-}
-
-bool FileContainerZip::file_is_opened_for_write()
-{
-	return is_opened() && file_writing_;
-}
-
-size_t FileContainerZip::file_read(void *buffer, size_t size)
-{
-	if (!file_is_opened_for_read()) return 0;
-	file_size_t file_size = file_reading_whole_container_
-	                      ? prev_storage_size_ : file_->second.size;
-	file_size_t remain_size = file_size - file_processed_size_;
-	size_t s = remain_size > (file_size_t)size ? size : (size_t)remain_size;
-	s = fread(buffer, 1, s, storage_file_);
-	file_processed_size_ += s;
-	return s;
-}
-
-size_t FileContainerZip::file_write(const void *buffer, size_t size)
-{
-	if (!file_is_opened_for_write()) return 0;
-	size_t s = fwrite(buffer, 1, size, storage_file_);
-	file_processed_size_ += s;
-	file_->second.size = file_processed_size_;
-	file_->second.crc32 = crc32(file_->second.crc32, buffer, s);
-	return s;
-}
-
-/* === E N T R Y P O I N T ================================================= */
-
-
+/* === S Y N F I G ========================================================= */
+/*!	\file filecontainerzip.cpp
+**	\brief FileContainerZip
+**
+**	$Id$
+**
+**	\legal
+**	......... ... 2013 Ivan Mahonin
+**
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
+**
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
+**	\endlegal
+*/
+/* ========================================================================= */
+
+/* === H E A D E R S ======================================================= */
+
+#ifdef USING_PCH
+#	include "pch.h"
+#else
+#ifdef HAVE_CONFIG_H
+#	include <config.h>
+#endif
+
+#include <cstring>
+#include <stdint.h>
+#include <cstddef>
+#include <ETL/stringf>
+#include <libxml++/libxml++.h>
+#include "filecontainerzip.h"
+
+#endif
+
+/* === U S I N G =========================================================== */
+
+using namespace std;
+using namespace etl;
+using namespace synfig;
+
+/* === M A C R O S ========================================================= */
+
+/* === G L O B A L S ======================================================= */
+
+/* === P R O C E D U R E S ================================================= */
+
+/* === M E T H O D S ======================================================= */
+
+namespace synfig
+{
+	namespace FileContainerZip_InternalStructs
+	{
+
+		#pragma pack(push, 1)
+
+		struct DOSTimestamp
+		{
+			uint16_t dos_time;
+			uint16_t dos_date;
+
+			inline DOSTimestamp():
+				dos_time(0), dos_date(0) { }
+
+			inline explicit DOSTimestamp(uint16_t dos_time, uint16_t dos_date):
+				dos_time(dos_time), dos_date(dos_date) { }
+
+			inline explicit DOSTimestamp(time_t time)
+			{
+				tm *t = localtime(&time);
+				dos_time = ((t->tm_sec  & 0x3f) >>  1)
+						 | ((t->tm_min  & 0x3f) <<  5)
+						 | ((t->tm_hour & 0x1f) << 11);
+				dos_date = ((t->tm_mday & 0x1f) <<  0)
+						 | ((t->tm_mon  & 0x0f) <<  5)
+						 | ((t->tm_year & 0x7f) <<  9);
+			}
+
+			inline time_t get_time()
+			{
+				tm t;
+				memset(&t, 0, sizeof(t));
+				t.tm_sec  = (dos_time <<  1) & 0x3f;
+				t.tm_min  = (dos_time >>  5) & 0x3f;
+				t.tm_hour = (dos_time >> 11) & 0x1f;
+				t.tm_mday = (dos_time >>  0) & 0x1f;
+				t.tm_mon  = (dos_time >>  5) & 0x0f;
+				t.tm_year = (dos_time >>  9) & 0x7f;
+				return mktime(&t);
+			}
+		};
+
+		struct LocalFileHeader
+		{
+			enum { valid_signature__ = 0x04034b50 };
+
+			uint32_t signature;			//!< Local file header signature = 0x04034b50 (read as a little-endian number)
+			uint16_t version;			//!< Version needed to extract (minimum)
+			uint16_t flags;				//!< General purpose bit flag
+			uint16_t compression;		//!< Compression method
+			uint16_t modification_time;	//!< File last modification time
+			uint16_t modification_date; //!< File last modification date
+			uint32_t crc32;				//!< CRC-32
+			uint32_t compressed_size;	//!< Compressed size
+			uint32_t uncompressed_size;	//!< Uncompressed size
+			uint16_t filename_length;	//!< File name length (n)
+			uint16_t extrafield_length; //!< Extra field length (m)
+			// next:
+			//   filename - n bytes
+			//   extrafield - m bytes
+			//   file data
+			//   optional LocalFileDataDescriptor (if bit 3 (0x08) set in flags)
+
+			inline LocalFileHeader()
+			{
+				memset(this, 0, sizeof(*this));
+				signature = valid_signature__;
+			}
+		};
+
+		struct LocalFileHeaderOverwrite
+		{
+			uint32_t crc32;				//!< CRC-32
+			uint32_t compressed_size;	//!< Compressed size
+			uint32_t uncompressed_size;	//!< Uncompressed size
+
+			inline LocalFileHeaderOverwrite()
+			{
+				memset(this, 0, sizeof(*this));
+			}
+
+			inline static size_t offset_from_header()
+			{
+				const static LocalFileHeader dummy;
+				return (size_t)((const char *)&dummy.crc32 - (const char *)&dummy);
+			}
+		};
+
+		struct CentralDirectoryFileHeader
+		{
+			enum { valid_signature__ = 0x02014b50 };
+
+			uint32_t signature;			//!< Central directory file header signature = 0x02014b50
+			uint16_t version;			//!< Version made by
+			uint16_t min_version;		//!< Version needed to extract (minimum)
+			uint16_t flags;				//!< General purpose bit flag
+			uint16_t compression;		//!< Compression method
+			uint16_t modification_time;	//!< File last modification time
+			uint16_t modification_date; //!< File last modification date
+			uint32_t crc32;				//!< CRC-32
+			uint32_t compressed_size;	//!< Compressed size
+			uint32_t uncompressed_size;	//!< Uncompressed size
+			uint16_t filename_length;	//!< File name length (n)
+			uint16_t extrafield_length;	//!< Extra field length (m)
+			uint16_t filecomment_length;//!< File comment length (k)
+			uint16_t disk_number;		//!< Disk number where file starts
+			uint16_t internal_attrs;	//!< Internal file attributes
+			uint32_t external_attrs;	//!< External file attributes
+			uint32_t offset;			//!< Relative offset of local file header.
+										//!< This is the number of bytes between the
+										//!< start of the first disk on which the
+										//!< file occurs, and the start of the local
+										//!< file header. This allows software reading
+										//!< the central directory to locate the
+										//!< position of the file inside the .ZIP file.
+			// next:
+			//   filename - n bytes
+			//   extrafield - m bytes
+			//   filecomment - k bytes
+			//   next CentralDirectorySignature
+
+			inline CentralDirectoryFileHeader()
+			{
+				memset(this, 0, sizeof(*this));
+				signature = valid_signature__;
+			}
+		};
+
+		struct EndOfCentralDirectory
+		{
+			enum { valid_signature__ = 0x06054b50 };
+
+			uint32_t signature;			//!< End of central directory signature = 0x06054b50
+			uint16_t current_disk;		//!< Number of this disk
+			uint16_t first_disk;		//!< Disk where central directory starts
+			uint16_t current_records;	//!< Number of central directory records on this disk
+			uint16_t total_records;		//!< Total number of central directory records
+			uint32_t size;				//!< Size of central directory (bytes)
+			uint32_t offset;			//!< Offset of start of central directory, relative to start of archive
+			uint16_t comment_length;	//!< Comment length (n)
+			// next:
+			//   comment - n bytes
+			//   end of file
+
+			inline EndOfCentralDirectory()
+			{
+				memset(this, 0, sizeof(*this));
+				signature = valid_signature__;
+			}
+		};
+
+		#pragma pack(pop)
+	}
+}
+
+using namespace synfig::FileContainerZip_InternalStructs;
+
+void FileContainerZip::FileInfo::split_name()
+{
+	size_t pos = name.rfind('/');
+	if (pos == std::string::npos || pos == 0)
+	{
+		name_part_directory.clear();
+		name_part_localname = name;
+	}
+	else
+	{
+		name_part_directory = name.substr(0, pos);
+		name_part_localname = name.substr(pos + 1);
+	}
+}
+
+FileContainerZip::FileContainerZip():
+storage_file_(NULL),
+prev_storage_size_(0),
+file_reading_whole_container_(false),
+file_reading_(false),
+file_writing_(false),
+file_processed_size_(0),
+changed_(false)
+{ }
+
+FileContainerZip::~FileContainerZip() { close(); }
+
+unsigned int FileContainerZip::crc32(unsigned int previous_crc, const void *buffer, size_t size)
+{
+	static const unsigned int table[] = {
+	    0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
+	    0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
+	    0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
+	    0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
+	    0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
+	    0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
+	    0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
+	    0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
+	    0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
+	    0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
+	    0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
+	    0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
+	    0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
+	    0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
+	    0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
+	    0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
+	    0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
+	    0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
+	    0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
+	    0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
+	    0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
+	    0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
+	    0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
+	    0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
+	    0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
+	    0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
+	    0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
+	    0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
+	    0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
+	    0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
+	    0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
+	    0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
+	};
+
+	unsigned int crc = previous_crc ^ 0xFFFFFFFFUL;
+	unsigned char *char_buf = (unsigned char *)buffer;
+	size_t remain = size;
+	while (remain--)
+		crc = table[(crc ^ *char_buf++) & 0xFF] ^ (crc >> 8);
+	return crc ^ 0xFFFFFFFFUL;
+}
+
+std::string FileContainerZip::encode_history(const FileContainerZip::HistoryRecord &history_record)
+{
+	xmlpp::Document document;
+	document.
+		create_root_node("history")->
+		add_child("prev_storage_size")->
+		set_child_text(strprintf("%lld", history_record.prev_storage_size));
+	return document.write_to_string_formatted();
+}
+
+FileContainerZip::HistoryRecord FileContainerZip::decode_history(const std::string &comment)
+{
+	HistoryRecord history_record;
+	xmlpp::DomParser parser;
+	parser.parse_memory(comment);
+	if(parser)
+	{
+		xmlpp::Element *root = parser.get_document()->get_root_node();
+		if (root->get_name() == "history")
+		{
+			xmlpp::Element::NodeList list = root->get_children();
+			for(xmlpp::Element::NodeList::iterator i = list.begin(); i != list.end(); i++)
+			{
+				if ((*i)->get_name() == "prev_storage_size")
+				{
+					std::string s;
+					xmlpp::Element::NodeList list = (*i)->get_children();
+					for(xmlpp::Element::NodeList::iterator j = list.begin(); j != list.end(); j++)
+						if (dynamic_cast<xmlpp::TextNode*>(*j))
+							s += dynamic_cast<xmlpp::TextNode*>(*j)->get_content();
+					history_record.prev_storage_size = strtoll(s.c_str(), NULL, 10);
+					if (history_record.prev_storage_size < 0)
+						history_record.prev_storage_size = 0;
+				}
+			}
+		}
+	}
+	return history_record;
+}
+
+void FileContainerZip::read_history(std::list<HistoryRecord> &list, FILE *f, file_size_t size)
+{
+	if (size < (long int)sizeof(EndOfCentralDirectory))
+		return;
+
+	// search "end of central directory" record
+
+	char buffer[(1 << 16) + sizeof(EndOfCentralDirectory)];
+	std::string comment;
+	size_t read_size = size > (long int)sizeof(buffer)
+					 ? sizeof(buffer) : (size_t)size;
+	fseek(f, (long int)size - (long int)read_size, SEEK_SET);
+	read_size = fread(&buffer, 1, read_size, f);
+	bool found = false;
+	HistoryRecord history_record;
+
+	for(int i = read_size - sizeof(EndOfCentralDirectory); i >= 0; i--)
+	{
+		EndOfCentralDirectory *e = (EndOfCentralDirectory*)&buffer[i];
+		if (e->signature == EndOfCentralDirectory::valid_signature__
+		 && e->comment_length == (uint16_t)(read_size - sizeof(EndOfCentralDirectory) - i))
+		{
+			// found
+			if (e->comment_length > 0)
+			{
+				comment = std::string(buffer + i + sizeof(EndOfCentralDirectory), e->comment_length);
+				history_record = decode_history(comment);
+				history_record.storage_size = size;
+				found = true;
+			}
+			break;
+		}
+	}
+
+	if (found)
+	{
+		list.front() = history_record;
+		if (history_record.prev_storage_size > 0 && history_record.prev_storage_size < size) {
+			list.push_front(HistoryRecord(0, history_record.prev_storage_size));
+			read_history(list, f, history_record.prev_storage_size);
+		}
+	}
+}
+
+std::list<FileContainerZip::HistoryRecord> FileContainerZip::read_history(const std::string &container_filename)
+{
+	std::list<HistoryRecord> list;
+
+	FILE *f = fopen(container_filename.c_str(), "rb");
+	if (f == NULL) return list;
+
+	fseek(f, 0, SEEK_END);
+	long int size = ftell(f);
+	if (size >= (long int)sizeof(EndOfCentralDirectory))
+	{
+		list.push_front(HistoryRecord(0, size));
+		read_history(list, f, size);
+	}
+
+	fclose(f);
+	return list;
+}
+
+bool FileContainerZip::create(const std::string &container_filename)
+{
+	if (is_opened()) return false;
+	storage_file_ = fopen(fix_slashes(container_filename).c_str(), "w+b");
+	if (is_opened()) changed_ = true;
+	return is_opened();
+}
+
+bool FileContainerZip::open_from_history(const std::string &container_filename, file_size_t truncate_storage_size) {
+	if (is_opened()) return false;
+	FILE *f = fopen(fix_slashes(container_filename).c_str(), "r+b");
+	if (f == NULL) return false;
+
+	// check size of file
+	fseek(f, 0, SEEK_END);
+	long int filesize = ftell(f);
+	long int actual_filesize = filesize;
+	if (filesize < (long int)sizeof(EndOfCentralDirectory))
+		{ fclose(f); return false; }
+
+	if (truncate_storage_size > 0 && truncate_storage_size < filesize)
+		filesize = (long int)truncate_storage_size;
+
+	char buffer[(1 << 16) + sizeof(EndOfCentralDirectory)];
+
+	// search "end of central directory" record
+	EndOfCentralDirectory ecd;
+	size_t read_size = filesize > (long int)sizeof(buffer)
+					 ? sizeof(buffer) : (size_t)filesize;
+	fseek(f, filesize - (long int)read_size, SEEK_SET);
+	read_size = fread(&buffer, 1, read_size, f);
+	bool found = false;
+	for(int i = read_size - sizeof(EndOfCentralDirectory); i >= 0; i--)
+	{
+		EndOfCentralDirectory *e = (EndOfCentralDirectory*)&buffer[i];
+		if (e->signature == EndOfCentralDirectory::valid_signature__
+		 && e->comment_length == (uint16_t)(read_size - sizeof(EndOfCentralDirectory) - i))
+		{
+			ecd = *e;
+			found = true;
+			break;
+		}
+	}
+	if (!found)
+		{ fclose(f); return false; }
+
+	// read "central directory"
+	FileMap files;
+	fseek(f, ecd.offset, SEEK_SET);
+	for(int i = 0; i < ecd.current_records; i++)
+	{
+		CentralDirectoryFileHeader cdfh;
+		if (sizeof(cdfh) != fread(&cdfh, 1, sizeof(cdfh), f))
+			{ fclose(f); return false; }
+
+		// read name, comment and extrafield
+		size_t extra_size = cdfh.filename_length
+		                  + cdfh.filecomment_length
+		                  + cdfh.extrafield_length;
+		if (extra_size != fread(buffer, 1, extra_size, f))
+			{ fclose(f); return false; }
+
+		if (cdfh.filename_length > 0
+		 && (cdfh.flags & 0x0071) == 0
+		 && cdfh.compression == 0)
+		{
+			FileInfo info;
+			if (buffer[cdfh.filename_length - 1] == '/')
+			{
+				info.name = std::string(buffer, buffer + cdfh.filename_length - 1);
+				info.is_directory = true;
+			}
+			else
+			{
+				info.name = std::string(buffer, buffer + cdfh.filename_length);
+			}
+
+			info.directory_saved = info.is_directory;
+			info.size = cdfh.compressed_size;
+			info.header_offset = cdfh.offset;
+			info.crc32 = cdfh.crc32;
+			info.time = DOSTimestamp(cdfh.modification_time, cdfh.modification_date).get_time();
+			info.split_name();
+			files[info.name] = info;
+		}
+	}
+
+	// create directories
+	for(FileMap::iterator i = files.begin(); i != files.end();)
+	{
+		if (!i->second.name_part_directory.empty()
+		 && files.find( i->second.name_part_directory ) == files.end())
+		{
+			FileInfo info;
+			info.name = i->second.name_part_directory;
+			info.is_directory = true;
+			info.time = time(NULL);
+			info.split_name();
+			files[ info.name ] = info;
+			i = files.begin();
+		}
+		else i++;
+	}
+
+	// loaded
+	fseek(f, 0, SEEK_END);
+	storage_file_ = f;
+	files_.swap( files );
+	prev_storage_size_ = actual_filesize;
+	file_reading_ = false;
+	file_writing_ = false;
+	changed_ = false;
+	return true;
+}
+
+bool FileContainerZip::open(const std::string &container_filename)
+{
+	return open_from_history(container_filename);
+}
+
+bool FileContainerZip::save()
+{
+	if (file_is_opened()) return false;
+	if (!changed_) return true;
+
+	fseek(storage_file_, 0, SEEK_END);
+
+	// write headers of new directories
+	for(FileMap::iterator i = files_.begin(); i != files_.end(); i++)
+	{
+		FileInfo &info = i->second;
+		if (info.is_directory && !info.directory_saved)
+		{
+			LocalFileHeader lfh;
+			lfh.version = 20;
+			lfh.filename_length = info.name.size() + 1;
+			DOSTimestamp dos_timestamp(info.time);
+			lfh.modification_time = dos_timestamp.dos_time;
+			lfh.modification_date = dos_timestamp.dos_date;
+
+			info.header_offset = ftell(storage_file_);
+			if (sizeof(lfh) != fwrite(&lfh, 1, sizeof(lfh), storage_file_))
+				return false;
+			if (info.name.size() != fwrite(info.name.c_str(), 1, info.name.size(), storage_file_))
+				return false;
+			if ((int)'/' != fputc('/', storage_file_))
+				return false;
+
+			info.directory_saved = true;
+		}
+	}
+
+	// write central directory
+	uint32_t central_directory_offset = (uint32_t)ftell(storage_file_);
+	for(FileMap::iterator i = files_.begin(); i != files_.end(); i++)
+	{
+		FileInfo &info = i->second;
+		CentralDirectoryFileHeader cdfh;
+		cdfh.min_version = 20;
+		cdfh.offset = info.header_offset;
+		cdfh.compressed_size = cdfh.uncompressed_size = info.size;
+		cdfh.crc32 = info.crc32;
+		cdfh.filename_length = (uint16_t)info.name.size();
+		if (info.is_directory)
+			cdfh.filename_length++;
+		DOSTimestamp dos_timestamp(info.time);
+		cdfh.modification_time = dos_timestamp.dos_time;
+		cdfh.modification_date = dos_timestamp.dos_date;
+
+		// write header
+		if (sizeof(cdfh) != fwrite(&cdfh, 1, sizeof(cdfh), storage_file_))
+			return false;
+
+		// write name
+		if (info.name.size() != fwrite(info.name.c_str(), 1, info.name.size(), storage_file_))
+			return false;
+		if (info.is_directory)
+			if ((int)'/' != fputc('/', storage_file_))
+				return false;
+	}
+
+	// end of central directory
+	EndOfCentralDirectory ecd;
+	ecd.offset = central_directory_offset;
+	ecd.current_records = ecd.total_records = files_.size();
+	ecd.size = ftell(storage_file_) - central_directory_offset;
+	std::string comment = encode_history(HistoryRecord(prev_storage_size_));
+	ecd.comment_length = comment.size();
+
+	// write header
+	if (sizeof(ecd) != fwrite(&ecd, 1, sizeof(ecd), storage_file_))
+		return false;
+
+	// write comment
+	if (ecd.comment_length > 0
+	 && ecd.comment_length != fwrite(comment.c_str(), 1, ecd.comment_length, storage_file_))
+	{
+		return false;
+	}
+
+	prev_storage_size_ = ftell(storage_file_);
+	fflush(storage_file_);
+	changed_ = false;
+	return true;
+}
+
+void FileContainerZip::close()
+{
+	if (!is_opened()) return;
+
+	// close opened file if need
+	file_close();
+
+	save();
+
+	// close storage file and clead variables
+	fclose(storage_file_);
+	storage_file_ = NULL;
+	files_.clear();
+	prev_storage_size_ = 0;
+	file_reading_ = false;
+	file_writing_ = false;
+	changed_ = false;
+}
+
+bool FileContainerZip::is_opened()
+{
+	return storage_file_ != NULL;
+}
+
+bool FileContainerZip::is_file(const std::string &filename)
+{
+	if (!is_opened()) return false;
+	FileMap::const_iterator i = files_.find(fix_slashes(filename));
+	return i != files_.end() && !i->second.is_directory;
+}
+
+bool FileContainerZip::is_directory(const std::string &filename)
+{
+	if (!is_opened()) return false;
+	if (filename.empty()) return true;
+	FileMap::const_iterator i = files_.find(fix_slashes(filename));
+	return i != files_.end() && i->second.is_directory;
+}
+
+bool FileContainerZip::directory_check_name(const std::string &dirname)
+{
+	return dirname.size() <= (1 << 16) - 2 - sizeof(CentralDirectoryFileHeader);
+}
+
+bool FileContainerZip::directory_create(const std::string &dirname)
+{
+	if (!is_opened()) return false;
+	if (is_file(dirname)) return false;
+	if (is_directory(dirname)) return true;
+	if (!directory_check_name(dirname)) return false;
+
+	FileInfo info;
+	info.name = fix_slashes(dirname);
+	info.split_name();
+	info.is_directory = true;
+	info.time = time(NULL);
+	if (info.name_part_localname.empty()
+	 || !is_directory(info.name_part_directory)) return false;
+
+	changed_ = true;
+	files_[info.name] = info;
+	return true;
+}
+
+bool FileContainerZip::directory_scan(const std::string &dirname, std::list< std::string > &out_files)
+{
+	out_files.clear();
+	if (!is_directory(dirname)) return false;
+	for(FileMap::iterator i = files_.begin(); i != files_.end(); i++)
+		if (i->second.name_part_directory == fix_slashes(dirname))
+			out_files.push_back(i->second.name_part_localname);
+	return true;
+}
+
+bool FileContainerZip::file_remove(const std::string &filename)
+{
+	if (is_directory(filename))
+	{
+		std::list< std::string > files;
+		directory_scan(filename, files);
+		if (!files.empty()) return false;
+		changed_ = true;
+		files_.erase(fix_slashes(filename));
+	}
+	else
+	if (is_file(filename))
+	{
+		if (file_is_opened() && file_->first == fix_slashes(filename))
+			return false;
+		changed_ = true;
+		files_.erase(fix_slashes(filename));
+	}
+	return true;
+}
+
+bool FileContainerZip::file_check_name(const std::string &filename)
+{
+	return filename.size() <= (1 << 16) - 1 - sizeof(CentralDirectoryFileHeader);
+}
+
+bool FileContainerZip::file_open_read_whole_container()
+{
+	if (!is_opened() || file_is_opened()) return false;
+	fseek(storage_file_, 0, SEEK_SET);
+	file_reading_whole_container_ = true;
+	file_processed_size_ = 0;
+	return true;
+}
+
+bool FileContainerZip::file_open_read(const std::string &filename)
+{
+	if (!is_opened() || file_is_opened()) return false;
+	file_ = files_.find(fix_slashes(filename));
+	if (file_ == files_.end() || file_->second.is_directory)
+		return false;
+
+	// read header
+	LocalFileHeader lfh;
+	fseek(storage_file_, file_->second.header_offset, SEEK_SET);
+	if (sizeof(lfh) != fread(&lfh, 1, sizeof(lfh), storage_file_))
+		return false;
+	if (lfh.signature != LocalFileHeader::valid_signature__)
+		return false;
+
+	// seek to file begin
+	fseek(storage_file_, lfh.filename_length + lfh.extrafield_length, SEEK_CUR);
+	file_reading_ = true;
+	file_processed_size_ = 0;
+	return true;
+}
+
+bool FileContainerZip::file_open_write(const std::string &filename)
+{
+	if (!is_opened() || file_is_opened()) return false;
+	if (!file_check_name(filename)) return false;
+
+	file_ = files_.find(fix_slashes(filename));
+
+	FileInfo new_info;
+	if (file_ == files_.end())
+	{
+		// create new file
+		new_info.name = fix_slashes(filename);
+		new_info.split_name();
+		if (new_info.name_part_localname.empty()
+		 || !is_directory(new_info.name_part_directory)) return false;
+	}
+	else
+	if (file_->second.is_directory)
+		return false;
+
+	FileInfo &info = file_ == files_.end() ? new_info : file_->second;
+
+	// write header
+	LocalFileHeader lfh;
+	time_t t = time(NULL);
+	lfh.version = 20;
+	lfh.filename_length = info.name.size();
+	DOSTimestamp dos_timestamp(t);
+	lfh.modification_time = dos_timestamp.dos_time;
+	lfh.modification_date = dos_timestamp.dos_date;
+
+	fseek(storage_file_, 0, SEEK_END);
+	long int offset = ftell(storage_file_);
+	changed_ = true;
+	if (sizeof(lfh) != fwrite(&lfh, 1, sizeof(lfh), storage_file_))
+		return false;
+	if (info.name.size() != fwrite(info.name.c_str(), 1, info.name.size(), storage_file_))
+		return false;
+
+	// update file info
+	info.header_offset = offset;
+	info.size = 0;
+	info.crc32 = 0;
+	info.time = t;
+	if (file_ == files_.end())
+	{
+		files_[new_info.name] = new_info;
+		file_ = files_.find(fix_slashes(filename));
+	}
+	file_writing_ = true;
+	file_processed_size_ = 0;
+	return true;
+}
+
+void FileContainerZip::file_close()
+{
+	if (file_is_opened_for_write())
+	{
+		LocalFileHeaderOverwrite lfho;
+		lfho.crc32 = file_->second.crc32;
+		lfho.compressed_size = lfho.uncompressed_size = file_->second.size;
+		fseek(storage_file_, file_->second.header_offset + LocalFileHeaderOverwrite::offset_from_header(), SEEK_SET);
+		fwrite(&lfho, 1, sizeof(lfho), storage_file_);
+		file_writing_ = false;
+		fflush(storage_file_);
+	}
+	file_reading_whole_container_ = false;
+	file_reading_ = false;
+	file_writing_ = false;
+	file_processed_size_ = 0;
+
+	// call base-class method to invalidate streams
+	FileContainer::file_close();
+}
+
+bool FileContainerZip::file_is_opened_for_read()
+{
+	return is_opened() && (file_reading_ || file_reading_whole_container_);
+}
+
+bool FileContainerZip::file_is_opened_for_write()
+{
+	return is_opened() && file_writing_;
+}
+
+size_t FileContainerZip::file_read(void *buffer, size_t size)
+{
+	if (!file_is_opened_for_read()) return 0;
+	file_size_t file_size = file_reading_whole_container_
+	                      ? prev_storage_size_ : file_->second.size;
+	file_size_t remain_size = file_size - file_processed_size_;
+	size_t s = remain_size > (file_size_t)size ? size : (size_t)remain_size;
+	s = fread(buffer, 1, s, storage_file_);
+	file_processed_size_ += s;
+	return s;
+}
+
+size_t FileContainerZip::file_write(const void *buffer, size_t size)
+{
+	if (!file_is_opened_for_write()) return 0;
+	size_t s = fwrite(buffer, 1, size, storage_file_);
+	file_processed_size_ += s;
+	file_->second.size = file_processed_size_;
+	file_->second.crc32 = crc32(file_->second.crc32, buffer, s);
+	return s;
+}
+
+/* === E N T R Y P O I N T ================================================= */
+
+
diff --git a/src/synfig/filecontainerzip.h b/src/synfig/filecontainerzip.h
index b62db95..4e7136c 100644
--- a/src/synfig/filecontainerzip.h
+++ b/src/synfig/filecontainerzip.h
@@ -1,142 +1,142 @@
-/* === S Y N F I G ========================================================= */
-/*!	\file filecontainerzip.h
-**	\brief FileContainerZip
-**
-**	$Id$
-**
-**	\legal
-**	......... ... 2013 Ivan Mahonin
-**
-**	This package is free software; you can redistribute it and/or
-**	modify it under the terms of the GNU General Public License as
-**	published by the Free Software Foundation; either version 2 of
-**	the License, or (at your option) any later version.
-**
-**	This package is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-**	General Public License for more details.
-**	\endlegal
-*/
-/* ========================================================================= */
-
-/* === S T A R T =========================================================== */
-
-#ifndef __SYNFIG_FILECONTAINERZIP_H
-#define __SYNFIG_FILECONTAINERZIP_H
-
-/* === H E A D E R S ======================================================= */
-
-#include <map>
-#include <ctime>
-#include "filecontainer.h"
-
-/* === M A C R O S ========================================================= */
-
-/* === T Y P E D E F S ===================================================== */
-
-/* === C L A S S E S & S T R U C T S ======================================= */
-
-namespace synfig
-{
-
-	class FileContainerZip: public FileContainer
-	{
-	public:
-		class WholeZipReadStream : public FileSystem::ReadStream
-		{
-		protected:
-			friend class FileContainerZip;
-			WholeZipReadStream(Handle file_system);
-		public:
-			virtual ~WholeZipReadStream();
-			virtual size_t read(void *buffer, size_t size);
-		};
-
-		typedef long long int file_size_t;
-
-		struct HistoryRecord {
-			file_size_t prev_storage_size;
-			file_size_t storage_size;
-			inline explicit HistoryRecord(file_size_t prev_storage_size = 0, file_size_t storage_size = 0):
-				prev_storage_size(prev_storage_size), storage_size(storage_size) { }
-		};
-
-	private:
-		struct FileInfo
-		{
-			std::string name;
-			bool is_directory;
-			bool directory_saved;
-			file_size_t size;
-			file_size_t header_offset;
-			unsigned int crc32;
-			time_t time;
-
-			std::string name_part_directory;
-			std::string name_part_localname;
-
-			void split_name();
-
-			inline FileInfo():
-				is_directory(false), directory_saved(false),
-				size(0), header_offset(0), crc32(0), time(0) { }
-		};
-
-		typedef std::map< std::string, FileInfo > FileMap;
-
-		FILE *storage_file_;
-		FileMap files_;
-		file_size_t prev_storage_size_;
-		bool file_reading_whole_container_;
-		bool file_reading_;
-		bool file_writing_;
-		FileMap::iterator file_;
-		file_size_t file_processed_size_;
-		bool changed_;
-
-		static unsigned int crc32(unsigned int previous_crc, const void *buffer, size_t size);
-		static std::string encode_history(const HistoryRecord &history_record);
-		static HistoryRecord decode_history(const std::string &comment);
-		static void read_history(std::list<HistoryRecord> &list, FILE *f, file_size_t size);
-
-	public:
-		FileContainerZip();
-		virtual ~FileContainerZip();
-
-		virtual bool create(const std::string &container_filename);
-		virtual bool open(const std::string &container_filename);
-		bool open_from_history(const std::string &container_filename, file_size_t truncate_storage_size = 0);
-		virtual void close();
-		virtual bool is_opened();
-		bool save();
-
-		static std::list<HistoryRecord> read_history(const std::string &container_filename);
-
-		virtual bool is_file(const std::string &filename);
-		virtual bool is_directory(const std::string &filename);
-
-		bool directory_check_name(const std::string &dirname);
-		virtual bool directory_create(const std::string &dirname);
-		virtual bool directory_scan(const std::string &dirname, std::list< std::string > &out_files);
-
-		virtual bool file_remove(const std::string &filename);
-
-		bool file_check_name(const std::string &filename);
-		virtual bool file_open_read_whole_container();
-		virtual bool file_open_read(const std::string &filename);
-		virtual bool file_open_write(const std::string &filename);
-		virtual void file_close();
-
-		virtual bool file_is_opened_for_read();
-		virtual bool file_is_opened_for_write();
-
-		virtual size_t file_read(void *buffer, size_t size);
-		virtual size_t file_write(const void *buffer, size_t size);
-	};
-
-}
-
-/* === E N D =============================================================== */
-
-#endif
+/* === S Y N F I G ========================================================= */
+/*!	\file filecontainerzip.h
+**	\brief FileContainerZip
+**
+**	$Id$
+**
+**	\legal
+**	......... ... 2013 Ivan Mahonin
+**
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
+**
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
+**	\endlegal
+*/
+/* ========================================================================= */
+
+/* === S T A R T =========================================================== */
+
+#ifndef __SYNFIG_FILECONTAINERZIP_H
+#define __SYNFIG_FILECONTAINERZIP_H
+
+/* === H E A D E R S ======================================================= */
+
+#include <map>
+#include <ctime>
+#include "filecontainer.h"
+
+/* === M A C R O S ========================================================= */
+
+/* === T Y P E D E F S ===================================================== */
+
+/* === C L A S S E S & S T R U C T S ======================================= */
+
+namespace synfig
+{
+
+	class FileContainerZip: public FileContainer
+	{
+	public:
+		class WholeZipReadStream : public FileSystem::ReadStream
+		{
+		protected:
+			friend class FileContainerZip;
+			WholeZipReadStream(Handle file_system);
+		public:
+			virtual ~WholeZipReadStream();
+			virtual size_t read(void *buffer, size_t size);
+		};
+
+		typedef long long int file_size_t;
+
+		struct HistoryRecord {
+			file_size_t prev_storage_size;
+			file_size_t storage_size;
+			inline explicit HistoryRecord(file_size_t prev_storage_size = 0, file_size_t storage_size = 0):
+				prev_storage_size(prev_storage_size), storage_size(storage_size) { }
+		};
+
+	private:
+		struct FileInfo
+		{
+			std::string name;
+			bool is_directory;
+			bool directory_saved;
+			file_size_t size;
+			file_size_t header_offset;
+			unsigned int crc32;
+			time_t time;
+
+			std::string name_part_directory;
+			std::string name_part_localname;
+
+			void split_name();
+
+			inline FileInfo():
+				is_directory(false), directory_saved(false),
+				size(0), header_offset(0), crc32(0), time(0) { }
+		};
+
+		typedef std::map< std::string, FileInfo > FileMap;
+
+		FILE *storage_file_;
+		FileMap files_;
+		file_size_t prev_storage_size_;
+		bool file_reading_whole_container_;
+		bool file_reading_;
+		bool file_writing_;
+		FileMap::iterator file_;
+		file_size_t file_processed_size_;
+		bool changed_;
+
+		static unsigned int crc32(unsigned int previous_crc, const void *buffer, size_t size);
+		static std::string encode_history(const HistoryRecord &history_record);
+		static HistoryRecord decode_history(const std::string &comment);
+		static void read_history(std::list<HistoryRecord> &list, FILE *f, file_size_t size);
+
+	public:
+		FileContainerZip();
+		virtual ~FileContainerZip();
+
+		virtual bool create(const std::string &container_filename);
+		virtual bool open(const std::string &container_filename);
+		bool open_from_history(const std::string &container_filename, file_size_t truncate_storage_size = 0);
+		virtual void close();
+		virtual bool is_opened();
+		bool save();
+
+		static std::list<HistoryRecord> read_history(const std::string &container_filename);
+
+		virtual bool is_file(const std::string &filename);
+		virtual bool is_directory(const std::string &filename);
+
+		bool directory_check_name(const std::string &dirname);
+		virtual bool directory_create(const std::string &dirname);
+		virtual bool directory_scan(const std::string &dirname, std::list< std::string > &out_files);
+
+		virtual bool file_remove(const std::string &filename);
+
+		bool file_check_name(const std::string &filename);
+		virtual bool file_open_read_whole_container();
+		virtual bool file_open_read(const std::string &filename);
+		virtual bool file_open_write(const std::string &filename);
+		virtual void file_close();
+
+		virtual bool file_is_opened_for_read();
+		virtual bool file_is_opened_for_write();
+
+		virtual size_t file_read(void *buffer, size_t size);
+		virtual size_t file_write(const void *buffer, size_t size);
+	};
+
+}
+
+/* === E N D =============================================================== */
+
+#endif
diff --git a/src/synfig/filesystem.h b/src/synfig/filesystem.h
index 0e9d8ad..4445699 100644
--- a/src/synfig/filesystem.h
+++ b/src/synfig/filesystem.h
@@ -1,174 +1,174 @@
-/* === S Y N F I G ========================================================= */
-/*!	\file filesystem.h
-**	\brief FileSystem
-**
-**	$Id$
-**
-**	\legal
-**	......... ... 2013 Ivan Mahonin
-**
-**	This package is free software; you can redistribute it and/or
-**	modify it under the terms of the GNU General Public License as
-**	published by the Free Software Foundation; either version 2 of
-**	the License, or (at your option) any later version.
-**
-**	This package is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-**	General Public License for more details.
-**	\endlegal
-*/
-/* ========================================================================= */
-
-/* === S T A R T =========================================================== */
-
-#ifndef __SYNFIG_FILESYSTEM_H
-#define __SYNFIG_FILESYSTEM_H
-
-/* === H E A D E R S ======================================================= */
-
-#include <cstdio>
-#include <string>
-#include <streambuf>
-#include <istream>
-#include <ostream>
-#include <ETL/handle>
-
-/* === M A C R O S ========================================================= */
-
-/* === T Y P E D E F S ===================================================== */
-
-/* === C L A S S E S & S T R U C T S ======================================= */
-
-namespace synfig
-{
-
-	class FileSystem : public etl::rshared_object
-	{
-	public:
-		typedef etl::handle< FileSystem > Handle;
-
-		class Stream : public etl::rshared_object
-		{
-		protected:
-			Handle file_system_;
-			Stream(Handle file_system);
-		public:
-			virtual ~Stream();
-			Handle file_system() const { return file_system_; }
-		};
-
-		class ReadStream :
-			public Stream,
-			private std::streambuf,
-			public std::istream
-		{
-		protected:
-			char buffer_;
-
-			ReadStream(Handle file_system);
-			virtual int underflow();
-			virtual size_t internal_read(void *buffer, size_t size) = 0;
-
-		public:
-			size_t read_block(void *buffer, size_t size)
-				{ return read((char*)buffer, size).gcount(); }
-			bool read_whole_block(void *buffer, size_t size)
-				{ return size == read_block(buffer, size); }
-			template<typename T> bool read_variable(T &v)
-				{ return read_whole_block(&v, sizeof(T)); }
-		};
-
-		typedef etl::handle< ReadStream > ReadStreamHandle;
-
-		class WriteStream :
-			public Stream,
-			private std::streambuf,
-			public std::ostream
-		{
-		protected:
-			WriteStream(Handle file_system);
-	        virtual int overflow(int ch);
-			virtual size_t internal_write(const void *buffer, size_t size) = 0;
-
-		public:
-			bool write_block(const void *buffer, size_t size)
-			{
-				for(size_t i = 0; i < size; i++)
-					if (!put(((const char*)buffer)[i]).good())
-						return i;
-				return size;
-			}
-			bool write_whole_block(const void *buffer, size_t size)
-				{ return size == write_block(buffer, size); }
-			bool write_whole_stream(std::streambuf &streambuf)
-				{ return (*this << &streambuf).good(); }
-			bool write_whole_stream(std::istream &stream)
-				{ return write_whole_stream(*stream.rdbuf()); }
-			bool write_whole_stream(ReadStreamHandle stream)
-				{ return !stream || write_whole_stream(*(std::istream*)&(*stream)); }
-			template<typename T> bool write_variable(const T &v)
-				{ return write_whole_block(&v, sizeof(T)); }
-		};
-
-		typedef etl::handle< WriteStream > WriteStreamHandle;
-
-		class Identifier {
-		public:
-			Handle file_system;
-			std::string filename;
-			Identifier() { }
-			Identifier(const Handle &file_system, const std::string &filename):
-				file_system(file_system), filename(filename) { }
-
-			bool empty() const { return file_system; }
-			operator bool () const { return !empty(); }
-
-			bool operator < (const Identifier &other) const
-			{
-				if (file_system.get() < other.file_system.get()) return true;
-				if (other.file_system.get() < file_system.get()) return false;
-				if (filename < other.filename) return true;
-				if (other.filename < filename) return false;
-				return false;
-			}
-			bool operator > (const Identifier &other) const
-				{ return other < *this; }
-			bool operator != (const Identifier &other) const
-				{ return *this > other || other < *this; }
-			bool operator == (const Identifier &other) const
-				{ return !(*this != other); }
-
-			ReadStreamHandle get_read_stream() const;
-			WriteStreamHandle get_write_stream() const;
-		};
-
-		FileSystem();
-		virtual ~FileSystem();
-
-		virtual bool is_file(const std::string &filename) = 0;
-		virtual bool is_directory(const std::string &filename) = 0;
-
-		virtual bool directory_create(const std::string &dirname) = 0;
-
-		virtual bool file_remove(const std::string &filename) = 0;
-		virtual bool file_rename(const std::string &from_filename, const std::string &to_filename);
-		virtual ReadStreamHandle get_read_stream(const std::string &filename) = 0;
-		virtual WriteStreamHandle get_write_stream(const std::string &filename) = 0;
-
-		inline bool is_exists(const std::string filename) { return is_file(filename) || is_directory(filename); }
-
-		Identifier get_identifier(const std::string &filename) { return Identifier(this, filename); }
-		static bool copy(Handle from_file_system, const std::string &from_filename, Handle to_file_system, const std::string &to_filename);
-
-		static std::string fix_slashes(const std::string &filename);
-
-		///!@brief Read a stream line by line even '\r\n' ended
-		static std::istream& safeGetline(std::istream& is, std::string& t);
-	};
-
-}
-
-/* === E N D =============================================================== */
-
-#endif
+/* === S Y N F I G ========================================================= */
+/*!	\file filesystem.h
+**	\brief FileSystem
+**
+**	$Id$
+**
+**	\legal
+**	......... ... 2013 Ivan Mahonin
+**
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
+**
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
+**	\endlegal
+*/
+/* ========================================================================= */
+
+/* === S T A R T =========================================================== */
+
+#ifndef __SYNFIG_FILESYSTEM_H
+#define __SYNFIG_FILESYSTEM_H
+
+/* === H E A D E R S ======================================================= */
+
+#include <cstdio>
+#include <string>
+#include <streambuf>
+#include <istream>
+#include <ostream>
+#include <ETL/handle>
+
+/* === M A C R O S ========================================================= */
+
+/* === T Y P E D E F S ===================================================== */
+
+/* === C L A S S E S & S T R U C T S ======================================= */
+
+namespace synfig
+{
+
+	class FileSystem : public etl::rshared_object
+	{
+	public:
+		typedef etl::handle< FileSystem > Handle;
+
+		class Stream : public etl::rshared_object
+		{
+		protected:
+			Handle file_system_;
+			Stream(Handle file_system);
+		public:
+			virtual ~Stream();
+			Handle file_system() const { return file_system_; }
+		};
+
+		class ReadStream :
+			public Stream,
+			private std::streambuf,
+			public std::istream
+		{
+		protected:
+			char buffer_;
+
+			ReadStream(Handle file_system);
+			virtual int underflow();
+			virtual size_t internal_read(void *buffer, size_t size) = 0;
+
+		public:
+			size_t read_block(void *buffer, size_t size)
+				{ return read((char*)buffer, size).gcount(); }
+			bool read_whole_block(void *buffer, size_t size)
+				{ return size == read_block(buffer, size); }
+			template<typename T> bool read_variable(T &v)
+				{ return read_whole_block(&v, sizeof(T)); }
+		};
+
+		typedef etl::handle< ReadStream > ReadStreamHandle;
+
+		class WriteStream :
+			public Stream,
+			private std::streambuf,
+			public std::ostream
+		{
+		protected:
+			WriteStream(Handle file_system);
+	        virtual int overflow(int ch);
+			virtual size_t internal_write(const void *buffer, size_t size) = 0;
+
+		public:
+			bool write_block(const void *buffer, size_t size)
+			{
+				for(size_t i = 0; i < size; i++)
+					if (!put(((const char*)buffer)[i]).good())
+						return i;
+				return size;
+			}
+			bool write_whole_block(const void *buffer, size_t size)
+				{ return size == write_block(buffer, size); }
+			bool write_whole_stream(std::streambuf &streambuf)
+				{ return (*this << &streambuf).good(); }
+			bool write_whole_stream(std::istream &stream)
+				{ return write_whole_stream(*stream.rdbuf()); }
+			bool write_whole_stream(ReadStreamHandle stream)
+				{ return !stream || write_whole_stream(*(std::istream*)&(*stream)); }
+			template<typename T> bool write_variable(const T &v)
+				{ return write_whole_block(&v, sizeof(T)); }
+		};
+
+		typedef etl::handle< WriteStream > WriteStreamHandle;
+
+		class Identifier {
+		public:
+			Handle file_system;
+			std::string filename;
+			Identifier() { }
+			Identifier(const Handle &file_system, const std::string &filename):
+				file_system(file_system), filename(filename) { }
+
+			bool empty() const { return file_system; }
+			operator bool () const { return !empty(); }
+
+			bool operator < (const Identifier &other) const
+			{
+				if (file_system.get() < other.file_system.get()) return true;
+				if (other.file_system.get() < file_system.get()) return false;
+				if (filename < other.filename) return true;
+				if (other.filename < filename) return false;
+				return false;
+			}
+			bool operator > (const Identifier &other) const
+				{ return other < *this; }
+			bool operator != (const Identifier &other) const
+				{ return *this > other || other < *this; }
+			bool operator == (const Identifier &other) const
+				{ return !(*this != other); }
+
+			ReadStreamHandle get_read_stream() const;
+			WriteStreamHandle get_write_stream() const;
+		};
+
+		FileSystem();
+		virtual ~FileSystem();
+
+		virtual bool is_file(const std::string &filename) = 0;
+		virtual bool is_directory(const std::string &filename) = 0;
+
+		virtual bool directory_create(const std::string &dirname) = 0;
+
+		virtual bool file_remove(const std::string &filename) = 0;
+		virtual bool file_rename(const std::string &from_filename, const std::string &to_filename);
+		virtual ReadStreamHandle get_read_stream(const std::string &filename) = 0;
+		virtual WriteStreamHandle get_write_stream(const std::string &filename) = 0;
+
+		inline bool is_exists(const std::string filename) { return is_file(filename) || is_directory(filename); }
+
+		Identifier get_identifier(const std::string &filename) { return Identifier(this, filename); }
+		static bool copy(Handle from_file_system, const std::string &from_filename, Handle to_file_system, const std::string &to_filename);
+
+		static std::string fix_slashes(const std::string &filename);
+
+		///!@brief Read a stream line by line even '\r\n' ended
+		static std::istream& safeGetline(std::istream& is, std::string& t);
+	};
+
+}
+
+/* === E N D =============================================================== */
+
+#endif
diff --git a/src/synfig/keyframe.cpp b/src/synfig/keyframe.cpp
index 0fdecfc..0800535 100644
--- a/src/synfig/keyframe.cpp
+++ b/src/synfig/keyframe.cpp
@@ -57,13 +57,15 @@ using namespace synfig;
 
 Keyframe::Keyframe():
 	time_(0),
-	active_(true)
+	active_(true),
+	has_waypoint_model_(false)
 {
 }
 
 Keyframe::Keyframe(const Time &time):
 	time_(time),
-	active_(true)
+	active_(true),
+	has_waypoint_model_(false)
 {
 }
 
@@ -76,6 +78,29 @@ Keyframe::set_active(bool x)
 	}
 }
 
+
+void
+Keyframe::apply_model(const Waypoint::Model &x)
+{
+    waypoint_model_.set_priority(x.get_priority());
+    waypoint_model_.set_before(x.get_before());
+    waypoint_model_.set_after(x.get_after());
+    waypoint_model_.set_tension(x.get_tension());
+    waypoint_model_.set_continuity(x.get_continuity());
+    waypoint_model_.set_bias(x.get_bias());
+    waypoint_model_.set_temporal_tension(x.get_temporal_tension());
+
+    waypoint_model_.set_priority_flag(x.get_priority_flag());
+    waypoint_model_.set_before_flag(x.get_before_flag());
+    waypoint_model_.set_after_flag(x.get_after_flag());
+    waypoint_model_.set_tension_flag(x.get_tension_flag());
+    waypoint_model_.set_continuity_flag(x.get_continuity_flag());
+    waypoint_model_.set_bias_flag(x.get_bias_flag());
+    waypoint_model_.set_temporal_tension_flag(x.get_temporal_tension_flag());
+
+    has_waypoint_model_ = true;
+}
+
 Keyframe::~Keyframe()
 {
 }
diff --git a/src/synfig/keyframe.h b/src/synfig/keyframe.h
index 79b461f..4255ee4 100644
--- a/src/synfig/keyframe.h
+++ b/src/synfig/keyframe.h
@@ -34,6 +34,7 @@
 #include "time.h"
 #include "uniqueid.h"
 #include "guid.h"
+#include "waypoint.h"
 
 /* === M A C R O S ========================================================= */
 
@@ -43,7 +44,13 @@
 
 namespace synfig {
 
-//! \writeme
+/*! \class Keyframe
+**  \brief Keyframe is used to record the state of the animation at that point (time_)
+*
+* A Keyframe can be described, actived or disabled and have an associated Waypoint::Model.
+* Common comparison operators can be used for Keyframes operation ==, <, != .
+* \see Keyframe::set_description(String x), Keyframe::get_description(), Keyframe::enable(), Keyframe::disable ()
+*/
 class Keyframe :  public UniqueID
 {
 private:
@@ -57,6 +64,12 @@ private:
 	*/
 	bool active_;
 
+	Waypoint::Model waypoint_model_;
+    /*! \c true a waypoint model has been affected, \c false when created
+    **  \see apply_model(const Waypoint::Model &x)
+    */
+	bool has_waypoint_model_;
+
 public:
 
 	Keyframe();
@@ -103,6 +116,12 @@ public:
 
 //	bool operator!=(const Keyframe &rhs)const { return id_!=rhs.id_; }
 	bool operator!=(const Time &rhs)const { return time_!=rhs; }
+
+	const Waypoint::Model &get_waypoint_model()const { return waypoint_model_; }
+	//! Keep a trace of the associated waypoint Model.
+	void apply_model(const Waypoint::Model &x);
+    //! Returns the status of the 'waypoint model' flag
+	bool has_model() const {return has_waypoint_model_; }
 }; // END of class Keyframe
 
 class KeyframeList : public std::vector<Keyframe>
diff --git a/src/synfig/layer.cpp b/src/synfig/layer.cpp
index 7827cf0..cbf89eb 100644
--- a/src/synfig/layer.cpp
+++ b/src/synfig/layer.cpp
@@ -35,23 +35,23 @@
 #include "layer.h"
 #include "render.h"
 #include "value.h"
-#include "layer_bitmap.h"
-#include "layer_mime.h"
+#include <synfig/layers/layer_bitmap.h>
+#include <synfig/layers/layer_mime.h>
 #include "context.h"
 #include "paramdesc.h"
 #include "surface.h"
 
-#include "layer_solidcolor.h"
-#include "layer_polygon.h"
-#include "layer_group.h"
-#include "layer_switch.h"
-#include "layer_motionblur.h"
-#include "layer_duplicate.h"
-#include "layer_skeleton.h"
-#include "layer_skeletondeformation.h"
-#include "layer_sound.h"
-
-#include "valuenode_const.h"
+#include <synfig/layers/layer_solidcolor.h>
+#include <synfig/layers/layer_polygon.h>
+#include <synfig/layers/layer_group.h>
+#include <synfig/layers/layer_switch.h>
+#include <synfig/layers/layer_motionblur.h>
+#include <synfig/layers/layer_duplicate.h>
+#include <synfig/layers/layer_skeleton.h>
+#include <synfig/layers/layer_skeletondeformation.h>
+#include <synfig/layers/layer_sound.h>
+
+#include "valuenodes/valuenode_const.h"
 
 #include "transform.h"
 #include "rect.h"
diff --git a/src/synfig/layers/Makefile_insert b/src/synfig/layers/Makefile_insert
new file mode 100644
index 0000000..128cc43
--- /dev/null
+++ b/src/synfig/layers/Makefile_insert
@@ -0,0 +1,41 @@
+LAYERS_HH = \
+	layers/layer_bitmap.h \
+	layers/layer_composite.h \
+	layers/layer_duplicate.h \
+	layers/layer_group.h \
+	layers/layer_meshtransform.h \
+	layers/layer_mime.h \
+	layers/layer_motionblur.h \
+	layers/layer_pastecanvas.h \
+	layers/layer_polygon.h \
+	layers/layer_shape.h \
+	layers/layer_solidcolor.h \
+	layers/layer_sound.h \
+	layers/layer_skeleton.h \
+	layers/layer_skeletondeformation.h \
+	layers/layer_switch.h
+
+LAYERS_CC = \
+	layers/layer_bitmap.cpp \
+	layers/layer_composite.cpp \
+	layers/layer_duplicate.cpp \
+	layers/layer_group.cpp \
+	layers/layer_meshtransform.cpp \
+	layers/layer_mime.cpp \
+	layers/layer_motionblur.cpp \
+	layers/layer_pastecanvas.cpp \
+	layers/layer_polygon.cpp \
+	layers/layer_shape.cpp \
+	layers/layer_solidcolor.cpp \
+	layers/layer_sound.cpp \
+	layers/layer_skeleton.cpp \
+	layers/layer_skeletondeformation.cpp \
+	layers/layer_switch.cpp
+
+libsynfig_include_HH += \
+    $(LAYERS_HH)
+
+libsynfig_src += \
+    $(LAYERS_HH) \
+    $(LAYERS_CC)
+
diff --git a/src/synfig/layer_bitmap.cpp b/src/synfig/layers/layer_bitmap.cpp
similarity index 98%
rename from src/synfig/layer_bitmap.cpp
rename to src/synfig/layers/layer_bitmap.cpp
index e0a10ac..ffa4ede 100644
--- a/src/synfig/layer_bitmap.cpp
+++ b/src/synfig/layers/layer_bitmap.cpp
@@ -31,20 +31,20 @@
 #endif
 
 #include "layer_bitmap.h"
-#include "layer.h"
-#include "time.h"
-#include "string.h"
-#include "vector.h"
-
-#include "context.h"
-#include "time.h"
-#include "color.h"
-#include "surface.h"
-#include "renddesc.h"
-#include "target.h"
-
-#include "general.h"
-#include "paramdesc.h"
+#include <synfig/layer.h>
+#include <synfig/time.h>
+#include <synfig/string.h>
+#include <synfig/vector.h>
+
+#include <synfig/context.h>
+#include <synfig/time.h>
+#include <synfig/color.h>
+#include <synfig/surface.h>
+#include <synfig/renddesc.h>
+#include <synfig/target.h>
+
+#include <synfig/general.h>
+#include <synfig/paramdesc.h>
 #include <ETL/misc>
 
 #endif
diff --git a/src/synfig/layer_bitmap.h b/src/synfig/layers/layer_bitmap.h
similarity index 97%
rename from src/synfig/layer_bitmap.h
rename to src/synfig/layers/layer_bitmap.h
index bf5a804..0562eb5 100644
--- a/src/synfig/layer_bitmap.h
+++ b/src/synfig/layers/layer_bitmap.h
@@ -29,8 +29,8 @@
 /* === H E A D E R S ======================================================= */
 
 #include "layer_composite.h"
-#include "surface.h"
-#include "target.h" // for RenderMethod
+#include <synfig/surface.h>
+#include <synfig/target.h> // for RenderMethod
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/layer_composite.cpp b/src/synfig/layers/layer_composite.cpp
similarity index 97%
rename from src/synfig/layer_composite.cpp
rename to src/synfig/layers/layer_composite.cpp
index 3b98156..ceb7bfa 100644
--- a/src/synfig/layer_composite.cpp
+++ b/src/synfig/layers/layer_composite.cpp
@@ -33,19 +33,19 @@
 
 #include "layer_composite.h"
 #include "layer_pastecanvas.h"
-#include "context.h"
-#include "time.h"
-#include "color.h"
-#include "surface.h"
-#include "renddesc.h"
-#include "target.h"
+#include <synfig/context.h>
+#include <synfig/time.h>
+#include <synfig/color.h>
+#include <synfig/surface.h>
+#include <synfig/renddesc.h>
+#include <synfig/target.h>
 
 #include "layer_bitmap.h"
 
-#include "general.h"
-#include "render.h"
-#include "paramdesc.h"
-#include "cairo_renddesc.h"
+#include <synfig/general.h>
+#include <synfig/render.h>
+#include <synfig/paramdesc.h>
+#include <synfig/cairo_renddesc.h>
 
 
 #endif
diff --git a/src/synfig/layer_composite.h b/src/synfig/layers/layer_composite.h
similarity index 97%
rename from src/synfig/layer_composite.h
rename to src/synfig/layers/layer_composite.h
index 7bca828..1791fa5 100644
--- a/src/synfig/layer_composite.h
+++ b/src/synfig/layers/layer_composite.h
@@ -28,9 +28,9 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "layer.h"
-#include "color.h"
-#include "cairo_operators.h"
+#include <synfig/layer.h>
+#include <synfig/color.h>
+#include <synfig/cairo_operators.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/layer_duplicate.cpp b/src/synfig/layers/layer_duplicate.cpp
similarity index 96%
rename from src/synfig/layer_duplicate.cpp
rename to src/synfig/layers/layer_duplicate.cpp
index 1e81dd7..2d86828 100644
--- a/src/synfig/layer_duplicate.cpp
+++ b/src/synfig/layers/layer_duplicate.cpp
@@ -30,16 +30,16 @@
 #	include <config.h>
 #endif
 
-#include "string.h"
+#include <synfig/string.h>
 #include "layer_duplicate.h"
-#include "time.h"
-#include "context.h"
-#include "paramdesc.h"
-#include "renddesc.h"
-#include "surface.h"
-#include "value.h"
-#include "valuenode.h"
-#include "canvas.h"
+#include <synfig/time.h>
+#include <synfig/context.h>
+#include <synfig/paramdesc.h>
+#include <synfig/renddesc.h>
+#include <synfig/surface.h>
+#include <synfig/value.h>
+#include <synfig/valuenode.h>
+#include <synfig/canvas.h>
 
 #endif
 
diff --git a/src/synfig/layer_duplicate.h b/src/synfig/layers/layer_duplicate.h
similarity index 97%
rename from src/synfig/layer_duplicate.h
rename to src/synfig/layers/layer_duplicate.h
index abf5433..55b7fd3 100644
--- a/src/synfig/layer_duplicate.h
+++ b/src/synfig/layers/layer_duplicate.h
@@ -28,9 +28,9 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode_duplicate.h"
+#include <synfig/valuenodes/valuenode_duplicate.h>
 #include "layer_composite.h"
-#include "time.h"
+#include <synfig/time.h>
 
 /* === S T R U C T S & C L A S S E S ======================================= */
 
diff --git a/src/synfig/layer_group.cpp b/src/synfig/layers/layer_group.cpp
similarity index 95%
rename from src/synfig/layer_group.cpp
rename to src/synfig/layers/layer_group.cpp
index d62b6a1..d211641 100644
--- a/src/synfig/layer_group.cpp
+++ b/src/synfig/layers/layer_group.cpp
@@ -33,13 +33,13 @@
 #endif
 
 #include "layer_group.h"
-#include "string.h"
-#include "time.h"
-#include "context.h"
-#include "paramdesc.h"
-#include "value.h"
-#include "valuenode.h"
-#include "canvas.h"
+#include <synfig/string.h>
+#include <synfig/time.h>
+#include <synfig/context.h>
+#include <synfig/paramdesc.h>
+#include <synfig/value.h>
+#include <synfig/valuenode.h>
+#include <synfig/canvas.h>
 
 
 #endif
diff --git a/src/synfig/layer_group.h b/src/synfig/layers/layer_group.h
similarity index 100%
rename from src/synfig/layer_group.h
rename to src/synfig/layers/layer_group.h
diff --git a/src/synfig/layer_meshtransform.cpp b/src/synfig/layers/layer_meshtransform.cpp
similarity index 98%
rename from src/synfig/layer_meshtransform.cpp
rename to src/synfig/layers/layer_meshtransform.cpp
index 5874dea..26687b2 100644
--- a/src/synfig/layer_meshtransform.cpp
+++ b/src/synfig/layers/layer_meshtransform.cpp
@@ -30,12 +30,12 @@
 #endif
 
 #include "layer_meshtransform.h"
-#include "renderersoftware.h"
+#include <synfig/renderersoftware.h>
 #include <algorithm>
 #include <cmath>
 #include <climits>
-#include "transform.h"
-#include "context.h"
+#include <synfig/transform.h>
+#include <synfig/context.h>
 
 #endif
 
diff --git a/src/synfig/layer_meshtransform.h b/src/synfig/layers/layer_meshtransform.h
similarity index 97%
rename from src/synfig/layer_meshtransform.h
rename to src/synfig/layers/layer_meshtransform.h
index 783165f..0ae5d9c 100644
--- a/src/synfig/layer_meshtransform.h
+++ b/src/synfig/layers/layer_meshtransform.h
@@ -28,8 +28,8 @@
 /* === H E A D E R S ======================================================= */
 
 #include "layer_composite.h"
-#include "mesh.h"
-#include "polygon.h"
+#include <synfig/mesh.h>
+#include <synfig/polygon.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/layer_mime.cpp b/src/synfig/layers/layer_mime.cpp
similarity index 91%
rename from src/synfig/layer_mime.cpp
rename to src/synfig/layers/layer_mime.cpp
index 3998c8f..4d2a730 100644
--- a/src/synfig/layer_mime.cpp
+++ b/src/synfig/layers/layer_mime.cpp
@@ -31,20 +31,20 @@
 
 #include "layer_mime.h"
 
-#include "layer.h"
-#include "time.h"
-#include "string.h"
-#include "vector.h"
-
-#include "context.h"
-#include "time.h"
-#include "color.h"
-#include "surface.h"
-#include "renddesc.h"
-#include "target.h"
-
-#include "general.h"
-#include "paramdesc.h"
+#include <synfig/layer.h>
+#include <synfig/time.h>
+#include <synfig/string.h>
+#include <synfig/vector.h>
+
+#include <synfig/context.h>
+#include <synfig/time.h>
+#include <synfig/color.h>
+#include <synfig/surface.h>
+#include <synfig/renddesc.h>
+#include <synfig/target.h>
+
+#include <synfig/general.h>
+#include <synfig/paramdesc.h>
 
 #endif
 
diff --git a/src/synfig/layer_mime.h b/src/synfig/layers/layer_mime.h
similarity index 97%
rename from src/synfig/layer_mime.h
rename to src/synfig/layers/layer_mime.h
index 9befa47..081467e 100644
--- a/src/synfig/layer_mime.h
+++ b/src/synfig/layers/layer_mime.h
@@ -27,8 +27,8 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "layer.h"
-#include "string.h"
+#include <synfig/layer.h>
+#include <synfig/string.h>
 #include <map>
 
 /* === M A C R O S ========================================================= */
diff --git a/src/synfig/layer_motionblur.cpp b/src/synfig/layers/layer_motionblur.cpp
similarity index 97%
rename from src/synfig/layer_motionblur.cpp
rename to src/synfig/layers/layer_motionblur.cpp
index 435a7a0..9fda34e 100644
--- a/src/synfig/layer_motionblur.cpp
+++ b/src/synfig/layers/layer_motionblur.cpp
@@ -30,16 +30,16 @@
 #	include <config.h>
 #endif
 
-#include "string.h"
+#include <synfig/string.h>
 #include "layer_motionblur.h"
-#include "time.h"
-#include "context.h"
-#include "paramdesc.h"
-#include "renddesc.h"
-#include "surface.h"
-#include "value.h"
-#include "valuenode.h"
-#include "canvas.h"
+#include <synfig/time.h>
+#include <synfig/context.h>
+#include <synfig/paramdesc.h>
+#include <synfig/renddesc.h>
+#include <synfig/surface.h>
+#include <synfig/value.h>
+#include <synfig/valuenode.h>
+#include <synfig/canvas.h>
 
 #endif
 
diff --git a/src/synfig/layer_motionblur.h b/src/synfig/layers/layer_motionblur.h
similarity index 99%
rename from src/synfig/layer_motionblur.h
rename to src/synfig/layers/layer_motionblur.h
index 113249e..d7e8054 100644
--- a/src/synfig/layer_motionblur.h
+++ b/src/synfig/layers/layer_motionblur.h
@@ -29,7 +29,7 @@
 /* === H E A D E R S ======================================================= */
 
 #include "layer_composite.h"
-#include "time.h"
+#include <synfig/time.h>
 
 /* === S T R U C T S & C L A S S E S ======================================= */
 
diff --git a/src/synfig/layer_pastecanvas.cpp b/src/synfig/layers/layer_pastecanvas.cpp
similarity index 95%
rename from src/synfig/layer_pastecanvas.cpp
rename to src/synfig/layers/layer_pastecanvas.cpp
index cde910d..435e2e9 100644
--- a/src/synfig/layer_pastecanvas.cpp
+++ b/src/synfig/layers/layer_pastecanvas.cpp
@@ -35,14 +35,14 @@
 #include "layer_pastecanvas.h"
 #include "string.h"
 #include "time.h"
-#include "context.h"
-#include "paramdesc.h"
-#include "renddesc.h"
-#include "surface.h"
-#include "value.h"
-#include "valuenode.h"
-#include "canvas.h"
-#include "cairo_renddesc.h"
+#include "../context.h"
+#include "../paramdesc.h"
+#include "../renddesc.h"
+#include "../surface.h"
+#include "../value.h"
+#include "../valuenode.h"
+#include "../canvas.h"
+#include "../cairo_renddesc.h"
 
 
 #endif
@@ -81,6 +81,7 @@ public:
 Layer_PasteCanvas::Layer_PasteCanvas():
 	param_origin(Point()),
 	param_transformation(Transformation()),
+	param_time_dilation (Real(1)),
 	param_time_offset (Time(0)),
 	depth(0),
 	extra_reference(false)
@@ -138,6 +139,11 @@ Layer_PasteCanvas::get_param_vocab()const
 		.set_description(_("Group content"))
 	);
 
+	ret.push_back(ParamDesc("time_dilation")
+		.set_local_name(_("Speed"))
+		.set_description(_("Multiplier to speed up, slow down, freeze, or reverse time"))
+	);
+
 	ret.push_back(ParamDesc("time_offset")
 		.set_local_name(_("Time Offset"))
 		.set_description(_("Time Offset to apply to the context"))
@@ -204,6 +210,7 @@ Layer_PasteCanvas::set_param(const String & param, const ValueBase &value)
 		return true;
 	}
 #else
+	IMPORT_VALUE(param_time_dilation);
 	IMPORT_VALUE(param_time_offset);
 #endif
 
@@ -291,6 +298,7 @@ Layer_PasteCanvas::get_param(const String& param)const
 		synfig::ValueBase ret(canvas);
 		return ret;
 	}
+	EXPORT_VALUE(param_time_dilation);
 	EXPORT_VALUE(param_time_offset);
 	EXPORT_VALUE(param_children_lock);
 	EXPORT_VALUE(param_curr_time);
@@ -302,6 +310,7 @@ Layer_PasteCanvas::get_param(const String& param)const
 void
 Layer_PasteCanvas::set_time(IndependentContext context, Time time)const
 {
+	Real time_dilation=param_time_dilation.get(Real());
 	Time time_offset=param_time_offset.get(Time());
 
 	if(depth==MAX_DEPTH)return;depth_counter counter(depth);
@@ -309,7 +318,7 @@ Layer_PasteCanvas::set_time(IndependentContext context, Time time)const
 
 	context.set_time(time);
 	if(canvas)
-		canvas->set_time(time+time_offset);
+		canvas->set_time(time*time_dilation+time_offset);
 }
 
 void
@@ -391,6 +400,7 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali
 	  * renddesc.get_transformation_matrix() );
 
 	Real outline_grow=param_outline_grow.get(Real());
+	Real time_dilation=param_time_dilation.get(Real());
 	Time time_offset=param_time_offset.get(Time());
 	Time curr_time=param_curr_time.get(Time());
 
@@ -427,7 +437,7 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali
 	canvas->set_grow_value(outline_grow+grow_value);
 
 	if(muck_with_time_ && curr_time!=Time::begin() /*&& canvas->get_time()!=curr_time+time_offset*/)
-		canvas->set_time(curr_time+time_offset);
+		canvas->set_time(curr_time*time_dilation+time_offset);
 
 	Color::BlendMethod blend_method(get_blend_method());
 	const Rect full_bounding_rect(canvasContext.get_full_bounding_rect());
@@ -543,6 +553,7 @@ Layer_PasteCanvas::accelerated_cairorender(Context context,cairo_t *cr, int qual
 	Transformation transformation(get_summary_transformation());
 
 	Real outline_grow=param_outline_grow.get(Real());
+	Real time_dilation=param_time_dilation.get(Real());
 	Time time_offset=param_time_offset.get(Time());
 	Time curr_time=param_curr_time.get(Time());
 
@@ -563,12 +574,6 @@ Layer_PasteCanvas::accelerated_cairorender(Context context,cairo_t *cr, int qual
 	SuperCallback stagethree(cb,9000,9999,10000);
 
 
-	Real grow_value(get_parent_canvas_grow_value());
-	canvas->set_grow_value(outline_grow+grow_value);
-
-	if(muck_with_time_ && curr_time!=Time::begin() /*&& canvas->get_time()!=curr_time+time_offset*/)
-		canvas->set_time(curr_time+time_offset);
-
 	bool ret;
 	RendDesc workdesc(renddesc);
 
@@ -577,6 +582,12 @@ Layer_PasteCanvas::accelerated_cairorender(Context context,cairo_t *cr, int qual
 	if(!ret)
 		return false;
 
+	Real grow_value(get_parent_canvas_grow_value());
+	canvas->set_grow_value(outline_grow+grow_value);
+
+	if(muck_with_time_ && curr_time!=Time::begin() /*&& canvas->get_time()!=curr_time+time_offset*/)
+		canvas->set_time(curr_time*time_dilation+time_offset);
+
 
 	// render the canvas to be pasted onto pastesurface
 	cairo_surface_t* pastesurface=cairo_surface_create_similar_image(cairo_get_target(cr), CAIRO_FORMAT_ARGB32, workdesc.get_w(), workdesc.get_h());
@@ -636,6 +647,7 @@ Layer_PasteCanvas::accelerated_cairorender(Context context,cairo_t *cr, int qual
 
 void Layer_PasteCanvas::get_times_vfunc(Node::time_set &set) const
 {
+	Real time_dilation=param_time_dilation.get(Real());
 	Time time_offset=param_time_offset.get(Time());
 
 	Node::time_set tset;
@@ -646,12 +658,18 @@ void Layer_PasteCanvas::get_times_vfunc(Node::time_set &set) const
 	//Make sure we offset the time...
 	//! \todo: SOMETHING STILL HAS TO BE DONE WITH THE OTHER DIRECTION
 	//		   (recursing down the tree needs to take this into account too...)
-	for(; i != end; ++i)
-		set.insert(*i
+	for(; i != end; ++i) {
 #ifdef ADJUST_WAYPOINTS_FOR_TIME_OFFSET // see node.h
-				   - time_offset
+		if (time_dilation!=0)
+		{
+			TimePoint tp = *i;
+			tp.set_time((tp.get_time() - time_offset) / time_dilation);
+			set.insert(tp);
+		}
+#else
+		set.insert(*i);
 #endif
-			);
+	}
 
 	Layer::get_times_vfunc(set);
 }
diff --git a/src/synfig/layer_pastecanvas.h b/src/synfig/layers/layer_pastecanvas.h
similarity index 95%
rename from src/synfig/layer_pastecanvas.h
rename to src/synfig/layers/layer_pastecanvas.h
index 5bfb7a7..983c7c0 100644
--- a/src/synfig/layer_pastecanvas.h
+++ b/src/synfig/layers/layer_pastecanvas.h
@@ -30,14 +30,14 @@
 /* === H E A D E R S ======================================================= */
 
 #include "layer_composite.h"
-#include "color.h"
-#include "vector.h"
-#include "real.h"
-#include "time.h"
-#include "canvasbase.h"
-#include "canvas.h"
-#include "rect.h"
-#include "transformation.h"
+#include <synfig/color.h>
+#include <synfig/vector.h>
+#include <synfig/real.h>
+#include <synfig/time.h>
+#include <synfig/canvasbase.h>
+#include <synfig/canvas.h>
+#include <synfig/rect.h>
+#include <synfig/transformation.h>
 
 /* === M A C R O S ========================================================= */
 
@@ -58,6 +58,8 @@ private:
 	ValueBase param_transformation;
 	//! Parameter: (etl::loose_handle<synfig::Canvas>) The canvas parameter
 	etl::loose_handle<synfig::Canvas> canvas;
+	//! Parameter: (Real) Time dilation of the paste canvas layer
+	ValueBase param_time_dilation;
 	//! Parameter: (Time) Time offset of the paste canvas layer
 	ValueBase param_time_offset;
 	//! Parameter: (Real) The value to grow the children outline layers
@@ -141,6 +143,8 @@ public:
 	//! Sets the canvas parameter.
 	//! \see get_sub_canvas()
 	void set_sub_canvas(etl::handle<synfig::Canvas> x);
+	//! Gets time dilation parameter
+	Real get_time_dilation()const { return param_time_dilation.get(Real()); }
 	//! Gets time offset parameter
 	Time get_time_offset()const { return param_time_offset.get(Time()); }
 
diff --git a/src/synfig/layer_polygon.cpp b/src/synfig/layers/layer_polygon.cpp
similarity index 95%
rename from src/synfig/layer_polygon.cpp
rename to src/synfig/layers/layer_polygon.cpp
index 12017e4..81d3722 100644
--- a/src/synfig/layer_polygon.cpp
+++ b/src/synfig/layers/layer_polygon.cpp
@@ -32,14 +32,14 @@
 #endif
 
 #include "layer_polygon.h"
-#include "string.h"
-#include "time.h"
-#include "context.h"
-#include "paramdesc.h"
-#include "renddesc.h"
-#include "surface.h"
-#include "value.h"
-#include "valuenode.h"
+#include <synfig/string.h>
+#include <synfig/time.h>
+#include <synfig/context.h>
+#include <synfig/paramdesc.h>
+#include <synfig/renddesc.h>
+#include <synfig/surface.h>
+#include <synfig/value.h>
+#include <synfig/valuenode.h>
 #include <vector>
 
 #include <deque>
diff --git a/src/synfig/layer_polygon.h b/src/synfig/layers/layer_polygon.h
similarity index 98%
rename from src/synfig/layer_polygon.h
rename to src/synfig/layers/layer_polygon.h
index d129b87..6db9ab6 100644
--- a/src/synfig/layer_polygon.h
+++ b/src/synfig/layers/layer_polygon.h
@@ -29,8 +29,8 @@
 /* === H E A D E R S ======================================================= */
 
 #include "layer_shape.h"
-#include "color.h"
-#include "vector.h"
+#include <synfig/color.h>
+#include <synfig/vector.h>
 #include <list>
 #include <vector>
 
diff --git a/src/synfig/layer_shape.cpp b/src/synfig/layers/layer_shape.cpp
similarity index 99%
rename from src/synfig/layer_shape.cpp
rename to src/synfig/layers/layer_shape.cpp
index c3d2f20..910fe2c 100644
--- a/src/synfig/layer_shape.cpp
+++ b/src/synfig/layers/layer_shape.cpp
@@ -32,20 +32,20 @@
 #endif
 
 #include "layer_shape.h"
-#include "string.h"
-#include "time.h"
-#include "context.h"
-#include "paramdesc.h"
-#include "renddesc.h"
-#include "surface.h"
-#include "value.h"
-#include "valuenode.h"
-#include "float.h"
-#include "blur.h"
-#include "cairo_renddesc.h"
-
-
-#include "curve_helper.h"
+#include <synfig/string.h>
+#include <synfig/time.h>
+#include <synfig/context.h>
+#include <synfig/paramdesc.h>
+#include <synfig/renddesc.h>
+#include <synfig/surface.h>
+#include <synfig/value.h>
+#include <synfig/valuenode.h>
+#include <float.h>
+#include <synfig/blur.h>
+#include <synfig/cairo_renddesc.h>
+
+
+#include <synfig/curve_helper.h>
 
 #include <vector>
 
diff --git a/src/synfig/layer_shape.h b/src/synfig/layers/layer_shape.h
similarity index 98%
rename from src/synfig/layer_shape.h
rename to src/synfig/layers/layer_shape.h
index 039ab02..54abf90 100644
--- a/src/synfig/layer_shape.h
+++ b/src/synfig/layers/layer_shape.h
@@ -30,9 +30,9 @@
 /* === H E A D E R S ======================================================= */
 
 #include "layer_composite.h"
-#include "color.h"
-#include "vector.h"
-#include "blur.h"
+#include <synfig/color.h>
+#include <synfig/vector.h>
+#include <synfig/blur.h>
 
 #include <vector>
 
diff --git a/src/synfig/layer_skeleton.cpp b/src/synfig/layers/layer_skeleton.cpp
similarity index 96%
rename from src/synfig/layer_skeleton.cpp
rename to src/synfig/layers/layer_skeleton.cpp
index 6ba3212..71b0822 100644
--- a/src/synfig/layer_skeleton.cpp
+++ b/src/synfig/layers/layer_skeleton.cpp
@@ -29,15 +29,15 @@
 #	include <config.h>
 #endif
 
-#include "string.h"
+#include <synfig/string.h>
 #include "layer_skeleton.h"
-#include "time.h"
-#include "context.h"
-#include "paramdesc.h"
-#include "renddesc.h"
-#include "surface.h"
-#include "value.h"
-#include "valuenode_bone.h"
+#include <synfig/time.h>
+#include <synfig/context.h>
+#include <synfig/paramdesc.h>
+#include <synfig/renddesc.h>
+#include <synfig/surface.h>
+#include <synfig/value.h>
+#include <synfig/valuenodes/valuenode_bone.h>
 
 #endif
 
diff --git a/src/synfig/layer_skeleton.h b/src/synfig/layers/layer_skeleton.h
similarity index 98%
rename from src/synfig/layer_skeleton.h
rename to src/synfig/layers/layer_skeleton.h
index 262366a..a7732af 100644
--- a/src/synfig/layer_skeleton.h
+++ b/src/synfig/layers/layer_skeleton.h
@@ -27,7 +27,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "bone.h"
+#include <synfig/bone.h>
 #include "layer_polygon.h"
 // #include <synfig/value.h>
 // #include <vector>
diff --git a/src/synfig/layer_skeletondeformation.cpp b/src/synfig/layers/layer_skeletondeformation.cpp
similarity index 98%
rename from src/synfig/layer_skeletondeformation.cpp
rename to src/synfig/layers/layer_skeletondeformation.cpp
index b778f1d..b60fe1f 100644
--- a/src/synfig/layer_skeletondeformation.cpp
+++ b/src/synfig/layers/layer_skeletondeformation.cpp
@@ -30,13 +30,13 @@
 #endif
 
 #include "layer_skeletondeformation.h"
-#include "string.h"
-#include "time.h"
-#include "context.h"
-#include "paramdesc.h"
-#include "value.h"
-#include "valuenode.h"
-#include "canvas.h"
+#include <synfig/string.h>
+#include <synfig/time.h>
+#include <synfig/context.h>
+#include <synfig/paramdesc.h>
+#include <synfig/value.h>
+#include <synfig/valuenode.h>
+#include <synfig/canvas.h>
 
 #include <vector>
 #include <map>
diff --git a/src/synfig/layer_skeletondeformation.h b/src/synfig/layers/layer_skeletondeformation.h
similarity index 97%
rename from src/synfig/layer_skeletondeformation.h
rename to src/synfig/layers/layer_skeletondeformation.h
index a92a482..2134a02 100644
--- a/src/synfig/layer_skeletondeformation.h
+++ b/src/synfig/layers/layer_skeletondeformation.h
@@ -28,9 +28,9 @@
 /* === H E A D E R S ======================================================= */
 
 #include "layer_meshtransform.h"
-#include "pair.h"
-#include "bone.h"
-#include "polygon.h"
+#include <synfig/pair.h>
+#include <synfig/bone.h>
+#include <synfig/polygon.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/layer_solidcolor.cpp b/src/synfig/layers/layer_solidcolor.cpp
similarity index 96%
rename from src/synfig/layer_solidcolor.cpp
rename to src/synfig/layers/layer_solidcolor.cpp
index 7a30649..787e9b9 100644
--- a/src/synfig/layer_solidcolor.cpp
+++ b/src/synfig/layers/layer_solidcolor.cpp
@@ -32,14 +32,14 @@
 #endif
 
 #include "layer_solidcolor.h"
-#include "string.h"
-#include "time.h"
-#include "context.h"
-#include "paramdesc.h"
-#include "renddesc.h"
-#include "surface.h"
-#include "value.h"
-#include "valuenode.h"
+#include <synfig/string.h>
+#include <synfig/time.h>
+#include <synfig/context.h>
+#include <synfig/paramdesc.h>
+#include <synfig/renddesc.h>
+#include <synfig/surface.h>
+#include <synfig/value.h>
+#include <synfig/valuenode.h>
 
 #endif
 
diff --git a/src/synfig/layer_solidcolor.h b/src/synfig/layers/layer_solidcolor.h
similarity index 98%
rename from src/synfig/layer_solidcolor.h
rename to src/synfig/layers/layer_solidcolor.h
index 5578788..c1ffea8 100644
--- a/src/synfig/layer_solidcolor.h
+++ b/src/synfig/layers/layer_solidcolor.h
@@ -29,7 +29,7 @@
 /* === H E A D E R S ======================================================= */
 
 #include "layer_composite.h"
-#include "color.h"
+#include <synfig/color.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/layer_sound.cpp b/src/synfig/layers/layer_sound.cpp
similarity index 95%
rename from src/synfig/layer_sound.cpp
rename to src/synfig/layers/layer_sound.cpp
index c151703..4403548 100644
--- a/src/synfig/layer_sound.cpp
+++ b/src/synfig/layers/layer_sound.cpp
@@ -30,11 +30,11 @@
 #endif
 
 #include "layer_sound.h"
-#include "string.h"
-#include "time.h"
-#include "real.h"
-#include "value.h"
-#include "soundprocessor.h"
+#include <synfig/string.h>
+#include <synfig/time.h>
+#include <synfig/real.h>
+#include <synfig/value.h>
+#include <synfig/soundprocessor.h>
 
 #endif
 
diff --git a/src/synfig/layer_sound.h b/src/synfig/layers/layer_sound.h
similarity index 98%
rename from src/synfig/layer_sound.h
rename to src/synfig/layers/layer_sound.h
index 1cf401a..cfd1e30 100644
--- a/src/synfig/layer_sound.h
+++ b/src/synfig/layers/layer_sound.h
@@ -28,7 +28,7 @@
 /* === H E A D E R S ======================================================= */
 
 #include "layer_composite.h"
-#include "color.h"
+#include <synfig/color.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/layer_switch.cpp b/src/synfig/layers/layer_switch.cpp
similarity index 93%
rename from src/synfig/layer_switch.cpp
rename to src/synfig/layers/layer_switch.cpp
index 93a2191..79d64cc 100644
--- a/src/synfig/layer_switch.cpp
+++ b/src/synfig/layers/layer_switch.cpp
@@ -30,13 +30,13 @@
 #endif
 
 #include "layer_switch.h"
-#include "string.h"
-#include "time.h"
-#include "context.h"
-#include "paramdesc.h"
-#include "value.h"
-#include "valuenode.h"
-#include "canvas.h"
+#include <synfig/string.h>
+#include <synfig/time.h>
+#include <synfig/context.h>
+#include <synfig/paramdesc.h>
+#include <synfig/value.h>
+#include <synfig/valuenode.h>
+#include <synfig/canvas.h>
 
 
 #endif
@@ -90,6 +90,7 @@ Layer_Switch::get_param_vocab()const
 	ret.push_back(ParamDesc("layer_name")
 		.set_local_name(_("Active Layer Name"))
 		.set_description(_("Only layer with specified name are visible"))
+		.set_hint("sublayer_name")
 	);
 
 	return ret;
diff --git a/src/synfig/layer_switch.h b/src/synfig/layers/layer_switch.h
similarity index 100%
rename from src/synfig/layer_switch.h
rename to src/synfig/layers/layer_switch.h
diff --git a/src/synfig/loadcanvas.cpp b/src/synfig/loadcanvas.cpp
index 2a8c094..62d6ae6 100644
--- a/src/synfig/loadcanvas.cpp
+++ b/src/synfig/loadcanvas.cpp
@@ -43,31 +43,31 @@
 #include <stdexcept>
 #include <iostream>
 
-#include "layer_group.h"
+#include <synfig/layers/layer_group.h>
 #include "loadcanvas.h"
 #include "valuenode.h"
 #include "boneweightpair.h"
-#include "valuenode_animated.h"
-#include "valuenode_composite.h"
-#include "valuenode_const.h"
-#include "valuenode_linear.h"
-#include "valuenode_dynamiclist.h"
-#include "valuenode_reference.h"
-#include "valuenode_add.h"
-#include "valuenode_scale.h"
-#include "valuenode_exp.h"
-#include "valuenode_timedswap.h"
-#include "valuenode_twotone.h"
-#include "valuenode_stripes.h"
-#include "valuenode_segcalctangent.h"
-#include "valuenode_segcalcvertex.h"
-#include "valuenode_bline.h"
-#include "valuenode_bone.h"
-#include "valuenode_boneweightpair.h"
-#include "valuenode_bonelink.h"
-#include "valuenode_weightedaverage.h"
-#include "valuenode_wplist.h"
-#include "valuenode_dilist.h"
+#include "valuenodes/valuenode_animated.h"
+#include "valuenodes/valuenode_composite.h"
+#include "valuenodes/valuenode_const.h"
+#include "valuenodes/valuenode_linear.h"
+#include "valuenodes/valuenode_dynamiclist.h"
+#include "valuenodes/valuenode_reference.h"
+#include "valuenodes/valuenode_add.h"
+#include "valuenodes/valuenode_scale.h"
+#include "valuenodes/valuenode_exp.h"
+#include "valuenodes/valuenode_timedswap.h"
+#include "valuenodes/valuenode_twotone.h"
+#include "valuenodes/valuenode_stripes.h"
+#include "valuenodes/valuenode_segcalctangent.h"
+#include "valuenodes/valuenode_segcalcvertex.h"
+#include "valuenodes/valuenode_bline.h"
+#include "valuenodes/valuenode_bone.h"
+#include "valuenodes/valuenode_boneweightpair.h"
+#include "valuenodes/valuenode_bonelink.h"
+#include "valuenodes/valuenode_weightedaverage.h"
+#include "valuenodes/valuenode_wplist.h"
+#include "valuenodes/valuenode_dilist.h"
 #include "valueoperations.h"
 
 #include "layer.h"
diff --git a/src/synfig/loadcanvas.h b/src/synfig/loadcanvas.h
index 9316557..8625298 100644
--- a/src/synfig/loadcanvas.h
+++ b/src/synfig/loadcanvas.h
@@ -34,11 +34,11 @@
 #include "valuenode.h"
 #include "vector.h"
 #include "value.h"
-#include "valuenode_subtract.h"
-#include "valuenode_animated.h"
-#include "valuenode_composite.h"
-#include "valuenode_staticlist.h"
-#include "valuenode_dynamiclist.h"
+#include "valuenodes/valuenode_subtract.h"
+#include "valuenodes/valuenode_animated.h"
+#include "valuenodes/valuenode_composite.h"
+#include "valuenodes/valuenode_staticlist.h"
+#include "valuenodes/valuenode_dynamiclist.h"
 #include "keyframe.h"
 #include "guid.h"
 #include "filesystemnative.h"
diff --git a/src/synfig/releases.h b/src/synfig/releases.h
index 8f5fd88..5f04880 100644
--- a/src/synfig/releases.h
+++ b/src/synfig/releases.h
@@ -54,6 +54,7 @@ namespace synfig {
 		RELEASE_VERSION_0_64_2,
 		RELEASE_VERSION_0_64_3,
 		RELEASE_VERSION_1_0,
+		RELEASE_VERSION_1_0_2,
 		RELEASE_VERSION_END
 	} ReleaseVersion;
 
diff --git a/src/synfig/savecanvas.cpp b/src/synfig/savecanvas.cpp
index 0db6c96..c2182b7 100644
--- a/src/synfig/savecanvas.cpp
+++ b/src/synfig/savecanvas.cpp
@@ -38,17 +38,17 @@
 #include "savecanvas.h"
 #include "general.h"
 #include "valuenode.h"
-#include "valuenode_animated.h"
-#include "valuenode_const.h"
-#include "valuenode_linear.h"
-#include "valuenode_staticlist.h"
-#include "valuenode_dynamiclist.h"
-#include "valuenode_reference.h"
-#include "valuenode_subtract.h"
-#include "valuenode_bline.h"
-#include "valuenode_bone.h"
-#include "valuenode_wplist.h"
-#include "valuenode_dilist.h"
+#include "valuenodes/valuenode_animated.h"
+#include "valuenodes/valuenode_const.h"
+#include "valuenodes/valuenode_linear.h"
+#include "valuenodes/valuenode_staticlist.h"
+#include "valuenodes/valuenode_dynamiclist.h"
+#include "valuenodes/valuenode_reference.h"
+#include "valuenodes/valuenode_subtract.h"
+#include "valuenodes/valuenode_bline.h"
+#include "valuenodes/valuenode_bone.h"
+#include "valuenodes/valuenode_wplist.h"
+#include "valuenodes/valuenode_dilist.h"
 #include "dashitem.h"
 #include "time.h"
 #include "keyframe.h"
diff --git a/src/synfig/synfig.h b/src/synfig/synfig.h
index b56029c..48f4077 100644
--- a/src/synfig/synfig.h
+++ b/src/synfig/synfig.h
@@ -115,13 +115,13 @@
 #endif
 
 #include "valuenode.h"
-#include "valuenode_subtract.h"
-//#include "valuenode_animated.h"
-#include "valuenode_composite.h"
-#include "valuenode_const.h"
-#include "valuenode_linear.h"
-#include "valuenode_dynamiclist.h"
-#include "valuenode_reference.h"
+#include "valuenodes/valuenode_subtract.h"
+//#include "valuenodes/valuenode_animated.h"
+#include "valuenodes/valuenode_composite.h"
+#include "valuenodes/valuenode_const.h"
+#include "valuenodes/valuenode_linear.h"
+#include "valuenodes/valuenode_dynamiclist.h"
+#include "valuenodes/valuenode_reference.h"
 
 #ifndef SYNFIG_NO_LOADSAVE
 # include "savecanvas.h"
diff --git a/src/synfig/target.h b/src/synfig/target.h
index 57fda15..67c9eef 100644
--- a/src/synfig/target.h
+++ b/src/synfig/target.h
@@ -59,9 +59,9 @@
 //! Sets the CVS ID of the target
 #define SYNFIG_TARGET_SET_CVS_ID(class,x) const char class::cvs_id__[]=x
 
-//! Defines de implementation of the create method for the target
+//! Defines implementation of the create method for the target
 //! \param filename The file name to be created by the target.
-//! |param p The parameters passed to the target (bit rate and vcodec)
+//! \param p The parameters passed to the target (bit rate and vcodec)
 #define SYNFIG_TARGET_INIT(class)										\
 	synfig::Target* class::create (const char *filename,				\
 								   synfig::TargetParam p)				\
@@ -164,7 +164,9 @@ public:
 	RendDesc desc;
 
 	//! Canvas being rendered in this target module
-	//! \see set_canvas()
+	/*!
+	 ** \sa set_canvas()
+	 */
 	etl::handle<Canvas> canvas;
 
 	//! Render quality used for the render process of the target.
@@ -172,9 +174,7 @@ public:
 	//! Gamma value used for the render process of the target
 	Gamma gamma_;
 	
-	//! Tells how to handle alpha
-	//! Used by non alpha supported targets to decide if the background
-	//! must be filled or not
+	//! Tells how to handle alpha. Used by non alpha supported targets to decide if the background must be filled or not
 	TargetAlphaMode alpha_mode;
 
 	//! When set to true, the target doesn't sync to canvas time.
@@ -198,8 +198,9 @@ public:
 	//! Gets the target avoid time synchronization
 	bool get_avoid_time_sync()const { return avoid_time_sync_; }
 	//! Tells how to handle alpha
-	//! Used by non alpha supported targets to decide if the background
-	//! must be filled or not
+	/*! Used by non alpha supported targets to decide if the background
+	 ** must be filled or not
+	 */
 	TargetAlphaMode get_alpha_mode()const { return alpha_mode; }
 	//! Sets how to handle alpha
 	void set_alpha_mode(TargetAlphaMode x=TARGET_ALPHA_MODE_KEEP) { alpha_mode=x; }
@@ -216,14 +217,18 @@ public:
 	const RendDesc &rend_desc()const { return desc; }
 	//! Sets the RendDesc for the Target to \a desc.
 	/*!	If there are any parts of \a desc that the render target
-	**	is not capable of doing, the render target will adjust
-	**	\a desc to fit its needs.
+	 ** is not capable of doing, the render target will adjust
+	 ** \a desc to fit its needs.
+	 ** \param d an RendDesc pointer.
+	 ** \return true on success
 	*/
 	virtual bool set_rend_desc(RendDesc *d) { desc=*d; return true; }
 	//! Renders the canvas to the target
 	virtual bool render(ProgressCallback *cb=NULL)=0;
 	//! Initialization tasks of the derived target.
-	//! @returns true if the initialization has no errors
+	/*!
+	 ** \returns true if the initialization has no errors
+	*/
 	virtual bool init(ProgressCallback *cb=NULL) { (void)cb; return true; }
 
 	//! Creates a new Target described by \a type, outputting to a file described by \a filename.
@@ -231,10 +236,9 @@ public:
 						 synfig::TargetParam params);
 	
 	//!	Sets the time for the next frame at \a time
-	/*!	\param time The time reference to be modified
+	/*! It modifies the curr_frame_ member which has to be set to zero when next_frame is called for the first time
+	 ** \param time The time reference to be modified
 	 **	\return The number of remainig frames to render
-	 **	It modifies the curr_frame_ member which has to be set to zero 
-	 ** when next_frame is called for the first time
 	 **	\sa curr_frame_
 	*/
 	virtual int	next_frame(Time& time);
diff --git a/src/synfig/targetparam.h b/src/synfig/targetparam.h
index e798edf..826a7f1 100644
--- a/src/synfig/targetparam.h
+++ b/src/synfig/targetparam.h
@@ -35,7 +35,7 @@ struct TargetParam
 {
 	//Spritesheet render direction
 	enum Direction {
-		HR = 0, //Horisontal 
+		HR = 0, //Horizontal 
 		VR = 1  //Vertical
 	};
 	
diff --git a/src/synfig/timepointcollect.cpp b/src/synfig/timepointcollect.cpp
index f93654a..d02d7b1 100644
--- a/src/synfig/timepointcollect.cpp
+++ b/src/synfig/timepointcollect.cpp
@@ -31,8 +31,8 @@
 #endif
 
 #include "timepointcollect.h"
-#include "valuenode_animated.h"
-#include "layer_pastecanvas.h"
+#include <synfig/valuenodes/valuenode_animated.h>
+#include <synfig/layers/layer_pastecanvas.h>
 #include "layer.h"
 #include "canvas.h"
 #include "value.h"
diff --git a/src/synfig/value.cpp b/src/synfig/value.cpp
index fc9ee14..87ae715 100644
--- a/src/synfig/value.cpp
+++ b/src/synfig/value.cpp
@@ -35,7 +35,7 @@
 #include "general.h"
 #include <ETL/stringf>
 #include "canvas.h"
-#include "valuenode_bone.h"
+#include "valuenodes/valuenode_bone.h"
 #include "gradient.h"
 #include "bone.h"
 #include "matrix.h"
diff --git a/src/synfig/valuenode.cpp b/src/synfig/valuenode.cpp
index 8188f87..fc83ed6 100644
--- a/src/synfig/valuenode.cpp
+++ b/src/synfig/valuenode.cpp
@@ -36,68 +36,69 @@
 #include "canvas.h"
 #include "releases.h"
 
-#include "valuenode_const.h"
-#include "valuenode_linear.h"
-#include "valuenode_composite.h"
-#include "valuenode_reference.h"
-#include "valuenode_boneinfluence.h"
-#include "valuenode_boneweightpair.h"
-#include "valuenode_bone.h"
-#include "valuenode_bonelink.h"
-#include "valuenode_greyed.h"
-#include "valuenode_scale.h"
-#include "valuenode_blinecalctangent.h"
-#include "valuenode_blinecalcvertex.h"
-#include "valuenode_blinecalcwidth.h"
-#include "valuenode_blinereversetangent.h"
-#include "valuenode_segcalctangent.h"
-#include "valuenode_segcalcvertex.h"
-#include "valuenode_repeat_gradient.h"
-#include "valuenode_stripes.h"
-#include "valuenode_range.h"
-#include "valuenode_add.h"
-#include "valuenode_subtract.h"
-#include "valuenode_timedswap.h"
-#include "valuenode_twotone.h"
-#include "valuenode_bline.h"
-#include "valuenode_staticlist.h"
-#include "valuenode_wplist.h"
-#include "valuenode_dilist.h"
-#include "valuenode_dynamiclist.h"
-#include "valuenode_radialcomposite.h"
-#include "valuenode_gradientrotate.h"
-#include "valuenode_sine.h"
-#include "valuenode_cos.h"
-#include "valuenode_atan2.h"
-#include "valuenode_exp.h"
-#include "valuenode_switch.h"
-#include "valuenode_timeloop.h"
-#include "valuenode_reciprocal.h"
-#include "valuenode_duplicate.h"
-#include "valuenode_integer.h"
-#include "valuenode_step.h"
-#include "valuenode_vectorangle.h"
-#include "valuenode_vectorlength.h"
-#include "valuenode_vectorx.h"
-#include "valuenode_vectory.h"
-#include "valuenode_gradientcolor.h"
-#include "valuenode_dotproduct.h"
-#include "valuenode_timestring.h"
-#include "valuenode_realstring.h"
-#include "valuenode_join.h"
-#include "valuenode_anglestring.h"
-#include "valuenode_intstring.h"
-#include "valuenode_log.h"
-#include "valuenode_pow.h"
-#include "valuenode_compare.h"
-#include "valuenode_not.h"
-#include "valuenode_and.h"
-#include "valuenode_or.h"
-#include "valuenode_real.h"
-#include "valuenode_average.h"
-#include "valuenode_dynamic.h"
-#include "valuenode_derivative.h"
-#include "valuenode_weightedaverage.h"
+#include "valuenodes/valuenode_const.h"
+#include "valuenodes/valuenode_linear.h"
+#include "valuenodes/valuenode_composite.h"
+#include "valuenodes/valuenode_reference.h"
+#include "valuenodes/valuenode_boneinfluence.h"
+#include "valuenodes/valuenode_boneweightpair.h"
+#include "valuenodes/valuenode_bone.h"
+#include "valuenodes/valuenode_bonelink.h"
+#include "valuenodes/valuenode_greyed.h"
+#include "valuenodes/valuenode_scale.h"
+#include "valuenodes/valuenode_blinecalctangent.h"
+#include "valuenodes/valuenode_blinecalcvertex.h"
+#include "valuenodes/valuenode_blinecalcwidth.h"
+#include "valuenodes/valuenode_blinereversetangent.h"
+#include "valuenodes/valuenode_segcalctangent.h"
+#include "valuenodes/valuenode_segcalcvertex.h"
+#include "valuenodes/valuenode_repeat_gradient.h"
+#include "valuenodes/valuenode_stripes.h"
+#include "valuenodes/valuenode_range.h"
+#include "valuenodes/valuenode_add.h"
+#include "valuenodes/valuenode_subtract.h"
+#include "valuenodes/valuenode_timedswap.h"
+#include "valuenodes/valuenode_twotone.h"
+#include "valuenodes/valuenode_bline.h"
+#include "valuenodes/valuenode_staticlist.h"
+#include "valuenodes/valuenode_wplist.h"
+#include "valuenodes/valuenode_dilist.h"
+#include "valuenodes/valuenode_dynamiclist.h"
+#include "valuenodes/valuenode_radialcomposite.h"
+#include "valuenodes/valuenode_gradientrotate.h"
+#include "valuenodes/valuenode_sine.h"
+#include "valuenodes/valuenode_cos.h"
+#include "valuenodes/valuenode_atan2.h"
+#include "valuenodes/valuenode_exp.h"
+#include "valuenodes/valuenode_switch.h"
+#include "valuenodes/valuenode_timeloop.h"
+#include "valuenodes/valuenode_reciprocal.h"
+#include "valuenodes/valuenode_duplicate.h"
+#include "valuenodes/valuenode_integer.h"
+#include "valuenodes/valuenode_step.h"
+#include "valuenodes/valuenode_vectorangle.h"
+#include "valuenodes/valuenode_vectorlength.h"
+#include "valuenodes/valuenode_vectorx.h"
+#include "valuenodes/valuenode_vectory.h"
+#include "valuenodes/valuenode_gradientcolor.h"
+#include "valuenodes/valuenode_dotproduct.h"
+#include "valuenodes/valuenode_timestring.h"
+#include "valuenodes/valuenode_realstring.h"
+#include "valuenodes/valuenode_join.h"
+#include "valuenodes/valuenode_anglestring.h"
+#include "valuenodes/valuenode_intstring.h"
+#include "valuenodes/valuenode_log.h"
+#include "valuenodes/valuenode_pow.h"
+#include "valuenodes/valuenode_compare.h"
+#include "valuenodes/valuenode_not.h"
+#include "valuenodes/valuenode_and.h"
+#include "valuenodes/valuenode_or.h"
+#include "valuenodes/valuenode_real.h"
+#include "valuenodes/valuenode_average.h"
+#include "valuenodes/valuenode_dynamic.h"
+#include "valuenodes/valuenode_derivative.h"
+#include "valuenodes/valuenode_weightedaverage.h"
+#include "valuenodes/valuenode_reverse.h"
 
 #include "layer.h"
 
@@ -216,6 +217,8 @@ ValueNode::subsys_init()
 	
 	ADD_VALUENODE(ValueNode_Dynamic,           "dynamic",         _("Dynamic"),          RELEASE_VERSION_1_0);
 	ADD_VALUENODE(ValueNode_Derivative,        "derivative",      _("Derivative"),       RELEASE_VERSION_1_0);
+	
+	ADD_VALUENODE(ValueNode_Reverse,           "reverse",         _("Reverse"),          RELEASE_VERSION_1_0_2);
 
 #undef ADD_VALUENODE_CREATE
 #undef ADD_VALUENODE
@@ -397,6 +400,27 @@ ValueNode::get_description(bool show_exported_name)const
 	return ret;
 }
 
+bool
+ValueNode::is_descendant(ValueNode::Handle value_node_dest)
+{
+    if(!value_node_dest)
+        return false;
+    if(Handle(this) == value_node_dest)
+        return true;
+
+    //! loop through the parents of each node in current_nodes
+    set<Node*> node_parents(value_node_dest->parent_set);
+    ValueNode::Handle value_node_parent = NULL;
+    for (set<Node*>::iterator iter = node_parents.begin(); iter != node_parents.end(); iter++)
+    {
+        value_node_parent = ValueNode::Handle::cast_dynamic(*iter);
+        if(Handle(this) == value_node_parent)
+            break;
+    }
+
+    return value_node_dest->parent_count() ? is_descendant(value_node_parent) : false;
+}
+
 ValueNodeList::ValueNodeList():
 	placeholder_count_(0)
 {
diff --git a/src/synfig/valuenode.h b/src/synfig/valuenode.h
index 2b3ceff..f98ef2d 100644
--- a/src/synfig/valuenode.h
+++ b/src/synfig/valuenode.h
@@ -228,6 +228,9 @@ public:
 	//! Returns \true if the Value Node has an ID (has been exported)
 	bool is_exported()const { return !get_id().empty(); }
 
+	//! Check recursively if \value_node_dest is a descendant of the Value Node
+	bool is_descendant(ValueNode::Handle value_node_dest);
+
 	//! Returns the type of the ValueNode
 	Type& get_type()const { return *type; }
 
@@ -256,8 +259,9 @@ public:
 	//! \see etl::rhandle
 	int replace(etl::handle<ValueNode> x);
 	
-	//! Get/Set the default interpolation for Value Nodes
+	//! Get the default interpolation for Value Nodes
 	virtual Interpolation get_interpolation()const { return INTERPOLATION_UNDEFINED; }
+	//! Set the default interpolation for Value Nodes
 	virtual void set_interpolation(Interpolation /* i*/) { }
 
 protected:
diff --git a/src/synfig/valuenodes/Makefile_insert b/src/synfig/valuenodes/Makefile_insert
new file mode 100644
index 0000000..c974715
--- /dev/null
+++ b/src/synfig/valuenodes/Makefile_insert
@@ -0,0 +1,140 @@
+VALUENODES_HH = \
+	valuenodes/valuenode_add.h \
+	valuenodes/valuenode_and.h \
+	valuenodes/valuenode_anglestring.h \
+	valuenodes/valuenode_animated.h \
+	valuenodes/valuenode_atan2.h \
+	valuenodes/valuenode_bline.h \
+	valuenodes/valuenode_blinecalctangent.h \
+	valuenodes/valuenode_blinecalcvertex.h \
+	valuenodes/valuenode_blinecalcwidth.h \
+	valuenodes/valuenode_blinereversetangent.h \
+	valuenodes/valuenode_compare.h \
+	valuenodes/valuenode_composite.h \
+	valuenodes/valuenode_const.h \
+	valuenodes/valuenode_cos.h \
+	valuenodes/valuenode_dilist.h \
+	valuenodes/valuenode_dotproduct.h \
+	valuenodes/valuenode_duplicate.h \
+	valuenodes/valuenode_dynamiclist.h \
+	valuenodes/valuenode_exp.h \
+	valuenodes/valuenode_gradientcolor.h \
+	valuenodes/valuenode_gradientrotate.h \
+	valuenodes/valuenode_greyed.h \
+	valuenodes/valuenode_integer.h \
+	valuenodes/valuenode_intstring.h \
+	valuenodes/valuenode_join.h \
+	valuenodes/valuenode_linear.h \
+	valuenodes/valuenode_log.h \
+	valuenodes/valuenode_not.h \
+	valuenodes/valuenode_or.h \
+	valuenodes/valuenode_pow.h \
+	valuenodes/valuenode_radialcomposite.h \
+	valuenodes/valuenode_range.h \
+	valuenodes/valuenode_real.h \
+	valuenodes/valuenode_realstring.h \
+	valuenodes/valuenode_reciprocal.h \
+	valuenodes/valuenode_reference.h \
+	valuenodes/valuenode_repeat_gradient.h \
+	valuenodes/valuenode_reverse.h \
+	valuenodes/valuenode_scale.h \
+	valuenodes/valuenode_segcalctangent.h \
+	valuenodes/valuenode_segcalcvertex.h \
+	valuenodes/valuenode_sine.h \
+	valuenodes/valuenode_step.h \
+	valuenodes/valuenode_stripes.h \
+	valuenodes/valuenode_subtract.h \
+	valuenodes/valuenode_switch.h \
+	valuenodes/valuenode_timedswap.h \
+	valuenodes/valuenode_timeloop.h \
+	valuenodes/valuenode_timestring.h \
+	valuenodes/valuenode_twotone.h \
+	valuenodes/valuenode_vectorangle.h \
+	valuenodes/valuenode_vectorlength.h \
+	valuenodes/valuenode_vectorx.h \
+	valuenodes/valuenode_vectory.h \
+	valuenodes/valuenode_boneinfluence.h \
+	valuenodes/valuenode_staticlist.h \
+	valuenodes/valuenode_bone.h \
+	valuenodes/valuenode_boneweightpair.h\
+	valuenodes/valuenode_wplist.h \
+	valuenodes/valuenode_bonelink.h \
+	valuenodes/valuenode_average.h \
+	valuenodes/valuenode_dynamic.h \
+	valuenodes/valuenode_derivative.h \
+	valuenodes/valuenode_weightedaverage.h
+
+VALUENODES_CC = \
+	valuenodes/valuenode_add.cpp \
+	valuenodes/valuenode_and.cpp \
+	valuenodes/valuenode_anglestring.cpp \
+	valuenodes/valuenode_animated.cpp \
+	valuenodes/valuenode_atan2.cpp \
+	valuenodes/valuenode_bline.cpp \
+	valuenodes/valuenode_blinecalctangent.cpp \
+	valuenodes/valuenode_blinecalcvertex.cpp \
+	valuenodes/valuenode_blinecalcwidth.cpp \
+	valuenodes/valuenode_blinereversetangent.cpp \
+	valuenodes/valuenode_compare.cpp \
+	valuenodes/valuenode_composite.cpp \
+	valuenodes/valuenode_const.cpp \
+	valuenodes/valuenode_cos.cpp \
+	valuenodes/valuenode_dilist.cpp \
+	valuenodes/valuenode_dotproduct.cpp \
+	valuenodes/valuenode_duplicate.cpp \
+	valuenodes/valuenode_dynamiclist.cpp \
+	valuenodes/valuenode_exp.cpp \
+	valuenodes/valuenode_gradientcolor.cpp \
+	valuenodes/valuenode_gradientrotate.cpp \
+	valuenodes/valuenode_greyed.cpp \
+	valuenodes/valuenode_integer.cpp \
+	valuenodes/valuenode_intstring.cpp \
+	valuenodes/valuenode_join.cpp \
+	valuenodes/valuenode_linear.cpp \
+	valuenodes/valuenode_log.cpp \
+	valuenodes/valuenode_not.cpp \
+	valuenodes/valuenode_or.cpp \
+	valuenodes/valuenode_pow.cpp \
+	valuenodes/valuenode_radialcomposite.cpp \
+	valuenodes/valuenode_range.cpp \
+	valuenodes/valuenode_real.cpp \
+	valuenodes/valuenode_realstring.cpp \
+	valuenodes/valuenode_reciprocal.cpp \
+	valuenodes/valuenode_reference.cpp \
+	valuenodes/valuenode_repeat_gradient.cpp \
+	valuenodes/valuenode_reverse.cpp \
+	valuenodes/valuenode_scale.cpp \
+	valuenodes/valuenode_segcalctangent.cpp \
+	valuenodes/valuenode_segcalcvertex.cpp \
+	valuenodes/valuenode_sine.cpp \
+	valuenodes/valuenode_step.cpp \
+	valuenodes/valuenode_stripes.cpp \
+	valuenodes/valuenode_subtract.cpp \
+	valuenodes/valuenode_switch.cpp \
+	valuenodes/valuenode_timedswap.cpp \
+	valuenodes/valuenode_timeloop.cpp \
+	valuenodes/valuenode_timestring.cpp \
+	valuenodes/valuenode_twotone.cpp \
+	valuenodes/valuenode_vectorangle.cpp \
+	valuenodes/valuenode_vectorlength.cpp \
+	valuenodes/valuenode_vectorx.cpp \
+	valuenodes/valuenode_vectory.cpp \
+	valuenodes/valuenode_boneinfluence.cpp \
+	valuenodes/valuenode_staticlist.cpp \
+	valuenodes/valuenode_bone.cpp \
+	valuenodes/valuenode_boneweightpair.cpp\
+	valuenodes/valuenode_wplist.cpp \
+	valuenodes/valuenode_bonelink.cpp \
+	valuenodes/valuenode_average.cpp\
+	valuenodes/valuenode_dynamic.cpp \
+	valuenodes/valuenode_derivative.cpp \
+	valuenodes/valuenode_weightedaverage.cpp
+
+libsynfig_include_HH += \
+    $(VALUENODES_HH)
+
+libsynfig_src += \
+    $(VALUENODES_HH) \
+    $(VALUENODES_CC)
+    
+
diff --git a/src/synfig/valuenode_add.cpp b/src/synfig/valuenodes/valuenode_add.cpp
similarity index 91%
rename from src/synfig/valuenode_add.cpp
rename to src/synfig/valuenodes/valuenode_add.cpp
index 2863299..2fc8003 100644
--- a/src/synfig/valuenode_add.cpp
+++ b/src/synfig/valuenodes/valuenode_add.cpp
@@ -31,15 +31,15 @@
 #	include <config.h>
 #endif
 
-#include "general.h"
+#include <synfig/general.h>
 #include "valuenode_add.h"
 #include "valuenode_const.h"
 #include <stdexcept>
-#include "color.h"
-#include "gradient.h"
-#include "vector.h"
-#include "angle.h"
-#include "real.h"
+#include <synfig/color.h>
+#include <synfig/gradient.h>
+#include <synfig/vector.h>
+#include <synfig/angle.h>
+#include <synfig/real.h>
 #include <ETL/misc>
 
 #endif
@@ -159,6 +159,18 @@ synfig::ValueNode_Add::operator()(Time t)const
 	return ValueBase();
 }
 
+ValueBase
+synfig::ValueNode_Add::get_inverse(Time t, const synfig::Real &target_value) const
+{
+	return target_value / (*scalar)(t).get(Real()) - (*ref_b)(t).get(Vector::value_type());
+}
+
+synfig::ValueBase
+synfig::ValueNode_Add::get_inverse(Time t, const synfig::Angle &target_value) const
+{
+	return target_value / (*scalar)(t).get(Real()) - (*ref_b)(t).get(Angle());
+}
+
 bool
 ValueNode_Add::set_link_vfunc(int i,ValueNode::Handle value)
 {
diff --git a/src/synfig/valuenode_add.h b/src/synfig/valuenodes/valuenode_add.h
similarity index 90%
rename from src/synfig/valuenode_add.h
rename to src/synfig/valuenodes/valuenode_add.h
index 1e365c5..e7b6351 100644
--- a/src/synfig/valuenode_add.h
+++ b/src/synfig/valuenodes/valuenode_add.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
@@ -61,6 +61,10 @@ public:
 	virtual String get_local_name()const;
 	static bool check_type(Type &type);
 	virtual Vocab get_children_vocab_vfunc()const;
+	//! Returns the modified Link to match the target value at time t
+	ValueBase get_inverse(Time t, const synfig::Real &target_value) const;
+	ValueBase get_inverse(Time t, const synfig::Angle &target_value) const;
+	
 }; // END of class ValueNode_Add
 
 }; // END of namespace synfig
diff --git a/src/synfig/valuenode_and.cpp b/src/synfig/valuenodes/valuenode_and.cpp
similarity index 99%
rename from src/synfig/valuenode_and.cpp
rename to src/synfig/valuenodes/valuenode_and.cpp
index d84cf2a..ff042cf 100644
--- a/src/synfig/valuenode_and.cpp
+++ b/src/synfig/valuenodes/valuenode_and.cpp
@@ -34,7 +34,7 @@
 
 #include "valuenode_and.h"
 #include "valuenode_const.h"
-#include "general.h"
+#include <synfig/general.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_and.h b/src/synfig/valuenodes/valuenode_and.h
similarity index 98%
rename from src/synfig/valuenode_and.h
rename to src/synfig/valuenodes/valuenode_and.h
index bc75c0a..373bf64 100644
--- a/src/synfig/valuenode_and.h
+++ b/src/synfig/valuenodes/valuenode_and.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_anglestring.cpp b/src/synfig/valuenodes/valuenode_anglestring.cpp
similarity index 98%
rename from src/synfig/valuenode_anglestring.cpp
rename to src/synfig/valuenodes/valuenode_anglestring.cpp
index 9d83b75..33864a5 100644
--- a/src/synfig/valuenode_anglestring.cpp
+++ b/src/synfig/valuenodes/valuenode_anglestring.cpp
@@ -33,8 +33,8 @@
 
 #include "valuenode_anglestring.h"
 #include "valuenode_const.h"
-#include "canvas.h"
-#include "general.h"
+#include <synfig/canvas.h>
+#include <synfig/general.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_anglestring.h b/src/synfig/valuenodes/valuenode_anglestring.h
similarity index 98%
rename from src/synfig/valuenode_anglestring.h
rename to src/synfig/valuenodes/valuenode_anglestring.h
index 0baf60e..2fa005c 100644
--- a/src/synfig/valuenode_anglestring.h
+++ b/src/synfig/valuenodes/valuenode_anglestring.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_animated.cpp b/src/synfig/valuenodes/valuenode_animated.cpp
similarity index 99%
rename from src/synfig/valuenode_animated.cpp
rename to src/synfig/valuenodes/valuenode_animated.cpp
index 1fd58c5..a65158d 100644
--- a/src/synfig/valuenode_animated.cpp
+++ b/src/synfig/valuenodes/valuenode_animated.cpp
@@ -45,13 +45,13 @@
 #include <algorithm>
 #include <typeinfo>
 
-#include "canvas.h"
-#include "general.h"
+#include <synfig/canvas.h>
+#include <synfig/general.h>
 #include "valuenode_animated.h"
 #include "valuenode_bone.h"
 #include "valuenode_const.h"
-#include "exception.h"
-#include "gradient.h"
+#include <synfig/exception.h>
+#include <synfig/gradient.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_animated.h b/src/synfig/valuenodes/valuenode_animated.h
similarity index 98%
rename from src/synfig/valuenode_animated.h
rename to src/synfig/valuenodes/valuenode_animated.h
index 2ae9035..0c4806e 100644
--- a/src/synfig/valuenode_animated.h
+++ b/src/synfig/valuenodes/valuenode_animated.h
@@ -29,9 +29,9 @@
 
 #include <list>
 
-#include "valuenode.h"
-#include "uniqueid.h"
-#include "waypoint.h"
+#include <synfig/valuenode.h>
+#include <synfig/uniqueid.h>
+#include <synfig/waypoint.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_atan2.cpp b/src/synfig/valuenodes/valuenode_atan2.cpp
similarity index 99%
rename from src/synfig/valuenode_atan2.cpp
rename to src/synfig/valuenodes/valuenode_atan2.cpp
index 1659480..cc95bbc 100644
--- a/src/synfig/valuenode_atan2.cpp
+++ b/src/synfig/valuenodes/valuenode_atan2.cpp
@@ -33,7 +33,7 @@
 
 #include "valuenode_atan2.h"
 #include "valuenode_const.h"
-#include "general.h"
+#include <synfig/general.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_atan2.h b/src/synfig/valuenodes/valuenode_atan2.h
similarity index 98%
rename from src/synfig/valuenode_atan2.h
rename to src/synfig/valuenodes/valuenode_atan2.h
index 49dcedc..f4c963c 100644
--- a/src/synfig/valuenode_atan2.h
+++ b/src/synfig/valuenodes/valuenode_atan2.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_average.cpp b/src/synfig/valuenodes/valuenode_average.cpp
similarity index 97%
rename from src/synfig/valuenode_average.cpp
rename to src/synfig/valuenodes/valuenode_average.cpp
index 12dcb48..d6e736c 100644
--- a/src/synfig/valuenode_average.cpp
+++ b/src/synfig/valuenodes/valuenode_average.cpp
@@ -31,8 +31,8 @@
 
 #include "valuenode_average.h"
 #include "valuenode_const.h"
-#include "valueoperations.h"
-#include "canvas.h"
+#include <synfig/valueoperations.h>
+#include <synfig/canvas.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_average.h b/src/synfig/valuenodes/valuenode_average.h
similarity index 100%
rename from src/synfig/valuenode_average.h
rename to src/synfig/valuenodes/valuenode_average.h
diff --git a/src/synfig/valuenode_bline.cpp b/src/synfig/valuenodes/valuenode_bline.cpp
similarity index 99%
rename from src/synfig/valuenode_bline.cpp
rename to src/synfig/valuenodes/valuenode_bline.cpp
index 2f63576..03bb6d1 100644
--- a/src/synfig/valuenode_bline.cpp
+++ b/src/synfig/valuenodes/valuenode_bline.cpp
@@ -34,17 +34,17 @@
 #include "valuenode_bline.h"
 #include "valuenode_const.h"
 #include "valuenode_composite.h"
-#include "canvas.h"
-#include "general.h"
-#include "exception.h"
-#include "blinepoint.h"
+#include <synfig/canvas.h>
+#include <synfig/general.h>
+#include <synfig/exception.h>
+#include <synfig/blinepoint.h>
 #include <vector>
 #include <list>
 #include <algorithm>
 #include <ETL/hermite>
 #include <ETL/calculus>
-#include "segment.h"
-#include "curve_helper.h"
+#include <synfig/segment.h>
+#include <synfig/curve_helper.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_bline.h b/src/synfig/valuenodes/valuenode_bline.h
similarity index 96%
rename from src/synfig/valuenode_bline.h
rename to src/synfig/valuenodes/valuenode_bline.h
index 05d67b3..1eb18f0 100644
--- a/src/synfig/valuenode_bline.h
+++ b/src/synfig/valuenodes/valuenode_bline.h
@@ -32,10 +32,10 @@
 #include <vector>
 #include <list>
 
-#include "valuenode.h"
-#include "time.h"
-#include "uniqueid.h"
-#include "blinepoint.h"
+#include <synfig/valuenode.h>
+#include <synfig/time.h>
+#include <synfig/uniqueid.h>
+#include <synfig/blinepoint.h>
 #include "valuenode_dynamiclist.h"
 
 /* === M A C R O S ========================================================= */
diff --git a/src/synfig/valuenode_blinecalctangent.cpp b/src/synfig/valuenodes/valuenode_blinecalctangent.cpp
similarity index 99%
rename from src/synfig/valuenode_blinecalctangent.cpp
rename to src/synfig/valuenodes/valuenode_blinecalctangent.cpp
index 79b816f..e8383a0 100644
--- a/src/synfig/valuenode_blinecalctangent.cpp
+++ b/src/synfig/valuenodes/valuenode_blinecalctangent.cpp
@@ -35,8 +35,8 @@
 #include "valuenode_bline.h"
 #include "valuenode_const.h"
 #include "valuenode_composite.h"
-#include "general.h"
-#include "exception.h"
+#include <synfig/general.h>
+#include <synfig/exception.h>
 #include <ETL/hermite>
 #include <ETL/calculus>
 
diff --git a/src/synfig/valuenode_blinecalctangent.h b/src/synfig/valuenodes/valuenode_blinecalctangent.h
similarity index 98%
rename from src/synfig/valuenode_blinecalctangent.h
rename to src/synfig/valuenodes/valuenode_blinecalctangent.h
index 8392a07..fa18a0c 100644
--- a/src/synfig/valuenode_blinecalctangent.h
+++ b/src/synfig/valuenodes/valuenode_blinecalctangent.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_blinecalcvertex.cpp b/src/synfig/valuenodes/valuenode_blinecalcvertex.cpp
similarity index 98%
rename from src/synfig/valuenode_blinecalcvertex.cpp
rename to src/synfig/valuenodes/valuenode_blinecalcvertex.cpp
index 41be34e..c9c1876 100644
--- a/src/synfig/valuenode_blinecalcvertex.cpp
+++ b/src/synfig/valuenodes/valuenode_blinecalcvertex.cpp
@@ -35,8 +35,8 @@
 #include "valuenode_bline.h"
 #include "valuenode_const.h"
 #include "valuenode_composite.h"
-#include "general.h"
-#include "exception.h"
+#include <synfig/general.h>
+#include <synfig/exception.h>
 #include <ETL/hermite>
 
 #endif
diff --git a/src/synfig/valuenode_blinecalcvertex.h b/src/synfig/valuenodes/valuenode_blinecalcvertex.h
similarity index 98%
rename from src/synfig/valuenode_blinecalcvertex.h
rename to src/synfig/valuenodes/valuenode_blinecalcvertex.h
index 11a8cdc..e79acac 100644
--- a/src/synfig/valuenode_blinecalcvertex.h
+++ b/src/synfig/valuenodes/valuenode_blinecalcvertex.h
@@ -28,7 +28,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_blinecalcwidth.cpp b/src/synfig/valuenodes/valuenode_blinecalcwidth.cpp
similarity index 99%
rename from src/synfig/valuenode_blinecalcwidth.cpp
rename to src/synfig/valuenodes/valuenode_blinecalcwidth.cpp
index dd9c265..f3d9225 100644
--- a/src/synfig/valuenode_blinecalcwidth.cpp
+++ b/src/synfig/valuenodes/valuenode_blinecalcwidth.cpp
@@ -35,8 +35,8 @@
 #include "valuenode_bline.h"
 #include "valuenode_const.h"
 #include "valuenode_composite.h"
-#include "general.h"
-#include "exception.h"
+#include <synfig/general.h>
+#include <synfig/exception.h>
 #include <ETL/hermite>
 
 #endif
diff --git a/src/synfig/valuenode_blinecalcwidth.h b/src/synfig/valuenodes/valuenode_blinecalcwidth.h
similarity index 98%
rename from src/synfig/valuenode_blinecalcwidth.h
rename to src/synfig/valuenodes/valuenode_blinecalcwidth.h
index 8dc1a98..c8cc0db 100644
--- a/src/synfig/valuenode_blinecalcwidth.h
+++ b/src/synfig/valuenodes/valuenode_blinecalcwidth.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_blinereversetangent.cpp b/src/synfig/valuenodes/valuenode_blinereversetangent.cpp
similarity index 98%
rename from src/synfig/valuenode_blinereversetangent.cpp
rename to src/synfig/valuenodes/valuenode_blinereversetangent.cpp
index 5b01c8f..e13faa0 100644
--- a/src/synfig/valuenode_blinereversetangent.cpp
+++ b/src/synfig/valuenodes/valuenode_blinereversetangent.cpp
@@ -35,8 +35,8 @@
 #include "valuenode_bline.h"
 #include "valuenode_const.h"
 #include "valuenode_composite.h"
-#include "general.h"
-#include "exception.h"
+#include <synfig/general.h>
+#include <synfig/exception.h>
 #include <ETL/hermite>
 #include <ETL/calculus>
 
diff --git a/src/synfig/valuenode_blinereversetangent.h b/src/synfig/valuenodes/valuenode_blinereversetangent.h
similarity index 98%
rename from src/synfig/valuenode_blinereversetangent.h
rename to src/synfig/valuenodes/valuenode_blinereversetangent.h
index d5e79d8..4e46cf0 100644
--- a/src/synfig/valuenode_blinereversetangent.h
+++ b/src/synfig/valuenodes/valuenode_blinereversetangent.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_bone.cpp b/src/synfig/valuenodes/valuenode_bone.cpp
similarity index 99%
rename from src/synfig/valuenode_bone.cpp
rename to src/synfig/valuenodes/valuenode_bone.cpp
index 9d69344..775e8ae 100644
--- a/src/synfig/valuenode_bone.cpp
+++ b/src/synfig/valuenodes/valuenode_bone.cpp
@@ -33,8 +33,8 @@
 #include "valuenode_bone.h"
 #include "valuenode_const.h"
 #include "valuenode_animated.h"
-#include "general.h"
-#include "canvas.h"
+#include <synfig/general.h>
+#include <synfig/canvas.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_bone.h b/src/synfig/valuenodes/valuenode_bone.h
similarity index 99%
rename from src/synfig/valuenode_bone.h
rename to src/synfig/valuenodes/valuenode_bone.h
index fe91d10..b8ca330 100644
--- a/src/synfig/valuenode_bone.h
+++ b/src/synfig/valuenodes/valuenode_bone.h
@@ -28,7 +28,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_boneinfluence.cpp b/src/synfig/valuenodes/valuenode_boneinfluence.cpp
similarity index 98%
rename from src/synfig/valuenode_boneinfluence.cpp
rename to src/synfig/valuenodes/valuenode_boneinfluence.cpp
index 5830fca..19ecb24 100644
--- a/src/synfig/valuenode_boneinfluence.cpp
+++ b/src/synfig/valuenodes/valuenode_boneinfluence.cpp
@@ -35,9 +35,9 @@
 #include "valuenode_staticlist.h"
 #include "valuenode_const.h"
 #include "valuenode_composite.h"
-#include "boneweightpair.h"
-#include "canvas.h"
-#include "general.h"
+#include <synfig/boneweightpair.h>
+#include <synfig/canvas.h>
+#include <synfig/general.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_boneinfluence.h b/src/synfig/valuenodes/valuenode_boneinfluence.h
similarity index 98%
rename from src/synfig/valuenode_boneinfluence.h
rename to src/synfig/valuenodes/valuenode_boneinfluence.h
index 5f3366b..abba62f 100644
--- a/src/synfig/valuenode_boneinfluence.h
+++ b/src/synfig/valuenodes/valuenode_boneinfluence.h
@@ -27,7 +27,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_bonelink.cpp b/src/synfig/valuenodes/valuenode_bonelink.cpp
similarity index 98%
rename from src/synfig/valuenode_bonelink.cpp
rename to src/synfig/valuenodes/valuenode_bonelink.cpp
index 290aac8..d066d33 100644
--- a/src/synfig/valuenode_bonelink.cpp
+++ b/src/synfig/valuenodes/valuenode_bonelink.cpp
@@ -32,8 +32,8 @@
 #include "valuenode_bonelink.h"
 #include "valuenode_const.h"
 #include "valuenode_bone.h"
-#include "general.h"
-#include "valueoperations.h"
+#include <synfig/general.h>
+#include <synfig/valueoperations.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_bonelink.h b/src/synfig/valuenodes/valuenode_bonelink.h
similarity index 98%
rename from src/synfig/valuenode_bonelink.h
rename to src/synfig/valuenodes/valuenode_bonelink.h
index 47ae3d1..fd49c6e 100644
--- a/src/synfig/valuenode_bonelink.h
+++ b/src/synfig/valuenodes/valuenode_bonelink.h
@@ -27,7 +27,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_boneweightpair.cpp b/src/synfig/valuenodes/valuenode_boneweightpair.cpp
similarity index 98%
rename from src/synfig/valuenode_boneweightpair.cpp
rename to src/synfig/valuenodes/valuenode_boneweightpair.cpp
index a2e7902..cb90108 100644
--- a/src/synfig/valuenode_boneweightpair.cpp
+++ b/src/synfig/valuenodes/valuenode_boneweightpair.cpp
@@ -34,9 +34,9 @@
 #include "valuenode_boneweightpair.h"
 #include "valuenode_bone.h"
 #include "valuenode_const.h"
-#include "canvas.h"
-#include "general.h"
-#include "boneweightpair.h"
+#include <synfig/canvas.h>
+#include <synfig/general.h>
+#include <synfig/boneweightpair.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_boneweightpair.h b/src/synfig/valuenodes/valuenode_boneweightpair.h
similarity index 98%
rename from src/synfig/valuenode_boneweightpair.h
rename to src/synfig/valuenodes/valuenode_boneweightpair.h
index 2ee900f..a28e1f9 100644
--- a/src/synfig/valuenode_boneweightpair.h
+++ b/src/synfig/valuenodes/valuenode_boneweightpair.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_compare.cpp b/src/synfig/valuenodes/valuenode_compare.cpp
similarity index 99%
rename from src/synfig/valuenode_compare.cpp
rename to src/synfig/valuenodes/valuenode_compare.cpp
index 34befbc..93bc479 100644
--- a/src/synfig/valuenode_compare.cpp
+++ b/src/synfig/valuenodes/valuenode_compare.cpp
@@ -34,7 +34,7 @@
 
 #include "valuenode_compare.h"
 #include "valuenode_const.h"
-#include "general.h"
+#include <synfig/general.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_compare.h b/src/synfig/valuenodes/valuenode_compare.h
similarity index 98%
rename from src/synfig/valuenode_compare.h
rename to src/synfig/valuenodes/valuenode_compare.h
index aeccfda..2b8794b 100644
--- a/src/synfig/valuenode_compare.h
+++ b/src/synfig/valuenodes/valuenode_compare.h
@@ -30,7 +30,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_composite.cpp b/src/synfig/valuenodes/valuenode_composite.cpp
similarity index 99%
rename from src/synfig/valuenode_composite.cpp
rename to src/synfig/valuenodes/valuenode_composite.cpp
index 2ed258a..9da1fdc 100644
--- a/src/synfig/valuenode_composite.cpp
+++ b/src/synfig/valuenodes/valuenode_composite.cpp
@@ -35,15 +35,15 @@
 #include "valuenode_composite.h"
 #include "valuenode_const.h"
 #include <stdexcept>
-#include "general.h"
+#include <synfig/general.h>
 #include "valuenode_radialcomposite.h"
-#include "vector.h"
-#include "color.h"
-#include "segment.h"
-#include "savecanvas.h"
-#include "transformation.h"
-#include "weightedvalue.h"
-#include "pair.h"
+#include <synfig/vector.h>
+#include <synfig/color.h>
+#include <synfig/segment.h>
+#include <synfig/savecanvas.h>
+#include <synfig/transformation.h>
+#include <synfig/weightedvalue.h>
+#include <synfig/pair.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_composite.h b/src/synfig/valuenodes/valuenode_composite.h
similarity index 98%
rename from src/synfig/valuenode_composite.h
rename to src/synfig/valuenodes/valuenode_composite.h
index 1228f7b..d380ccf 100644
--- a/src/synfig/valuenode_composite.h
+++ b/src/synfig/valuenodes/valuenode_composite.h
@@ -28,7 +28,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_const.cpp b/src/synfig/valuenodes/valuenode_const.cpp
similarity index 98%
rename from src/synfig/valuenode_const.cpp
rename to src/synfig/valuenodes/valuenode_const.cpp
index bec8ab8..95e3152 100644
--- a/src/synfig/valuenode_const.cpp
+++ b/src/synfig/valuenodes/valuenode_const.cpp
@@ -33,9 +33,9 @@
 #include "valuenode_bone.h"
 #include "valuenode_boneweightpair.h"
 #include "valuenode_composite.h"
-#include "canvas.h"
-#include "general.h"
-#include "pair.h"
+#include <synfig/canvas.h>
+#include <synfig/general.h>
+#include <synfig/pair.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_const.h b/src/synfig/valuenodes/valuenode_const.h
similarity index 98%
rename from src/synfig/valuenode_const.h
rename to src/synfig/valuenodes/valuenode_const.h
index e7fb05c..ce0b51a 100644
--- a/src/synfig/valuenode_const.h
+++ b/src/synfig/valuenodes/valuenode_const.h
@@ -27,7 +27,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_cos.cpp b/src/synfig/valuenodes/valuenode_cos.cpp
similarity index 99%
rename from src/synfig/valuenode_cos.cpp
rename to src/synfig/valuenodes/valuenode_cos.cpp
index 279652d..c30ac84 100644
--- a/src/synfig/valuenode_cos.cpp
+++ b/src/synfig/valuenodes/valuenode_cos.cpp
@@ -33,7 +33,7 @@
 
 #include "valuenode_cos.h"
 #include "valuenode_const.h"
-#include "general.h"
+#include <synfig/general.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_cos.h b/src/synfig/valuenodes/valuenode_cos.h
similarity index 98%
rename from src/synfig/valuenode_cos.h
rename to src/synfig/valuenodes/valuenode_cos.h
index 5a12c73..4878c57 100644
--- a/src/synfig/valuenode_cos.h
+++ b/src/synfig/valuenodes/valuenode_cos.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_derivative.cpp b/src/synfig/valuenodes/valuenode_derivative.cpp
similarity index 99%
rename from src/synfig/valuenode_derivative.cpp
rename to src/synfig/valuenodes/valuenode_derivative.cpp
index e17b756..d7b49c6 100644
--- a/src/synfig/valuenode_derivative.cpp
+++ b/src/synfig/valuenodes/valuenode_derivative.cpp
@@ -31,7 +31,7 @@
 
 #include "valuenode_derivative.h"
 #include "valuenode_const.h"
-#include "general.h"
+#include <synfig/general.h>
 #include <ETL/misc>
 
 #endif
diff --git a/src/synfig/valuenode_derivative.h b/src/synfig/valuenodes/valuenode_derivative.h
similarity index 98%
rename from src/synfig/valuenode_derivative.h
rename to src/synfig/valuenodes/valuenode_derivative.h
index fe4244d..b77099e 100644
--- a/src/synfig/valuenode_derivative.h
+++ b/src/synfig/valuenodes/valuenode_derivative.h
@@ -27,7 +27,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_dilist.cpp b/src/synfig/valuenodes/valuenode_dilist.cpp
similarity index 98%
rename from src/synfig/valuenode_dilist.cpp
rename to src/synfig/valuenodes/valuenode_dilist.cpp
index b6eb928..438b284 100644
--- a/src/synfig/valuenode_dilist.cpp
+++ b/src/synfig/valuenodes/valuenode_dilist.cpp
@@ -34,9 +34,9 @@
 #include "valuenode_const.h"
 #include "valuenode_composite.h"
 #include "valuenode_bline.h"
-#include "general.h"
-#include "exception.h"
-#include "dashitem.h"
+#include <synfig/general.h>
+#include <synfig/exception.h>
+#include <synfig/dashitem.h>
 #include <vector>
 #include <list>
 
diff --git a/src/synfig/valuenode_dilist.h b/src/synfig/valuenodes/valuenode_dilist.h
similarity index 96%
rename from src/synfig/valuenode_dilist.h
rename to src/synfig/valuenodes/valuenode_dilist.h
index 0857e16..ba75470 100644
--- a/src/synfig/valuenode_dilist.h
+++ b/src/synfig/valuenodes/valuenode_dilist.h
@@ -32,10 +32,10 @@
 #include <vector>
 #include <list>
 
-#include "valuenode.h"
-#include "time.h"
-#include "uniqueid.h"
-#include "dashitem.h"
+#include <synfig/valuenode.h>
+#include <synfig/time.h>
+#include <synfig/uniqueid.h>
+#include <synfig/dashitem.h>
 #include "valuenode_dynamiclist.h"
 
 /* === M A C R O S ========================================================= */
diff --git a/src/synfig/valuenode_dotproduct.cpp b/src/synfig/valuenodes/valuenode_dotproduct.cpp
similarity index 99%
rename from src/synfig/valuenode_dotproduct.cpp
rename to src/synfig/valuenodes/valuenode_dotproduct.cpp
index 0b9fcf0..e0794fb 100644
--- a/src/synfig/valuenode_dotproduct.cpp
+++ b/src/synfig/valuenodes/valuenode_dotproduct.cpp
@@ -33,7 +33,7 @@
 
 #include "valuenode_dotproduct.h"
 #include "valuenode_const.h"
-#include "general.h"
+#include <synfig/general.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_dotproduct.h b/src/synfig/valuenodes/valuenode_dotproduct.h
similarity index 98%
rename from src/synfig/valuenode_dotproduct.h
rename to src/synfig/valuenodes/valuenode_dotproduct.h
index 6c19b5c..4a78f7b 100644
--- a/src/synfig/valuenode_dotproduct.h
+++ b/src/synfig/valuenodes/valuenode_dotproduct.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_duplicate.cpp b/src/synfig/valuenodes/valuenode_duplicate.cpp
similarity index 99%
rename from src/synfig/valuenode_duplicate.cpp
rename to src/synfig/valuenodes/valuenode_duplicate.cpp
index 747d5f3..c10a723 100644
--- a/src/synfig/valuenode_duplicate.cpp
+++ b/src/synfig/valuenodes/valuenode_duplicate.cpp
@@ -33,7 +33,7 @@
 
 #include "valuenode_duplicate.h"
 #include "valuenode_const.h"
-#include "general.h"
+#include <synfig/general.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_duplicate.h b/src/synfig/valuenodes/valuenode_duplicate.h
similarity index 98%
rename from src/synfig/valuenode_duplicate.h
rename to src/synfig/valuenodes/valuenode_duplicate.h
index b63a6b8..a4511d5 100644
--- a/src/synfig/valuenode_duplicate.h
+++ b/src/synfig/valuenodes/valuenode_duplicate.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_dynamic.cpp b/src/synfig/valuenodes/valuenode_dynamic.cpp
similarity index 99%
rename from src/synfig/valuenode_dynamic.cpp
rename to src/synfig/valuenodes/valuenode_dynamic.cpp
index 44b14a1..49aa5d0 100644
--- a/src/synfig/valuenode_dynamic.cpp
+++ b/src/synfig/valuenodes/valuenode_dynamic.cpp
@@ -31,7 +31,7 @@
 
 #include "valuenode_dynamic.h"
 #include "valuenode_const.h"
-#include "general.h"
+#include <synfig/general.h>
 #include <ETL/misc>
 
 #include <boost/numeric/odeint/integrate/integrate.hpp>
diff --git a/src/synfig/valuenode_dynamic.h b/src/synfig/valuenodes/valuenode_dynamic.h
similarity index 99%
rename from src/synfig/valuenode_dynamic.h
rename to src/synfig/valuenodes/valuenode_dynamic.h
index e0c7a50..8f409d9 100644
--- a/src/synfig/valuenode_dynamic.h
+++ b/src/synfig/valuenodes/valuenode_dynamic.h
@@ -27,7 +27,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 #include "valuenode_derivative.h"
 #include "valuenode_const.h"
 
diff --git a/src/synfig/valuenode_dynamiclist.cpp b/src/synfig/valuenodes/valuenode_dynamiclist.cpp
similarity index 99%
rename from src/synfig/valuenode_dynamiclist.cpp
rename to src/synfig/valuenodes/valuenode_dynamiclist.cpp
index 60f9950..697f9cc 100644
--- a/src/synfig/valuenode_dynamiclist.cpp
+++ b/src/synfig/valuenodes/valuenode_dynamiclist.cpp
@@ -34,12 +34,12 @@
 #include "valuenode_dynamiclist.h"
 #include "valuenode_const.h"
 #include "valuenode_composite.h"
-#include "general.h"
-#include "exception.h"
+#include <synfig/general.h>
+#include <synfig/exception.h>
 #include <vector>
 #include <list>
 #include <algorithm>
-#include "canvas.h"
+#include <synfig/canvas.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_dynamiclist.h b/src/synfig/valuenodes/valuenode_dynamiclist.h
similarity index 98%
rename from src/synfig/valuenode_dynamiclist.h
rename to src/synfig/valuenodes/valuenode_dynamiclist.h
index 034c512..c9f711d 100644
--- a/src/synfig/valuenode_dynamiclist.h
+++ b/src/synfig/valuenodes/valuenode_dynamiclist.h
@@ -31,10 +31,10 @@
 #include <vector>
 #include <list>
 
-#include "valuenode.h"
-#include "time.h"
-#include "uniqueid.h"
-#include "activepoint.h"
+#include <synfig/valuenode.h>
+#include <synfig/time.h>
+#include <synfig/uniqueid.h>
+#include <synfig/activepoint.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_exp.cpp b/src/synfig/valuenodes/valuenode_exp.cpp
similarity index 99%
rename from src/synfig/valuenode_exp.cpp
rename to src/synfig/valuenodes/valuenode_exp.cpp
index c450882..fa9ac32 100644
--- a/src/synfig/valuenode_exp.cpp
+++ b/src/synfig/valuenodes/valuenode_exp.cpp
@@ -33,7 +33,7 @@
 
 #include "valuenode_exp.h"
 #include "valuenode_const.h"
-#include "general.h"
+#include <synfig/general.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_exp.h b/src/synfig/valuenodes/valuenode_exp.h
similarity index 98%
rename from src/synfig/valuenode_exp.h
rename to src/synfig/valuenodes/valuenode_exp.h
index a6982e1..d6c1b9f 100644
--- a/src/synfig/valuenode_exp.h
+++ b/src/synfig/valuenodes/valuenode_exp.h
@@ -28,7 +28,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_gradientcolor.cpp b/src/synfig/valuenodes/valuenode_gradientcolor.cpp
similarity index 98%
rename from src/synfig/valuenode_gradientcolor.cpp
rename to src/synfig/valuenodes/valuenode_gradientcolor.cpp
index 282845b..d7e3e42 100644
--- a/src/synfig/valuenode_gradientcolor.cpp
+++ b/src/synfig/valuenodes/valuenode_gradientcolor.cpp
@@ -33,8 +33,8 @@
 
 #include "valuenode_gradientcolor.h"
 #include "valuenode_const.h"
-#include "gradient.h"
-#include "general.h"
+#include <synfig/gradient.h>
+#include <synfig/general.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_gradientcolor.h b/src/synfig/valuenodes/valuenode_gradientcolor.h
similarity index 98%
rename from src/synfig/valuenode_gradientcolor.h
rename to src/synfig/valuenodes/valuenode_gradientcolor.h
index 70a7c98..a928b45 100644
--- a/src/synfig/valuenode_gradientcolor.h
+++ b/src/synfig/valuenodes/valuenode_gradientcolor.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_gradientrotate.cpp b/src/synfig/valuenodes/valuenode_gradientrotate.cpp
similarity index 98%
rename from src/synfig/valuenode_gradientrotate.cpp
rename to src/synfig/valuenodes/valuenode_gradientrotate.cpp
index ba5d4c6..a7c81b6 100644
--- a/src/synfig/valuenode_gradientrotate.cpp
+++ b/src/synfig/valuenodes/valuenode_gradientrotate.cpp
@@ -31,11 +31,11 @@
 #	include <config.h>
 #endif
 
-#include "general.h"
+#include <synfig/general.h>
 #include "valuenode_gradientrotate.h"
 #include "valuenode_const.h"
 #include <stdexcept>
-#include "gradient.h"
+#include <synfig/gradient.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_gradientrotate.h b/src/synfig/valuenodes/valuenode_gradientrotate.h
similarity index 98%
rename from src/synfig/valuenode_gradientrotate.h
rename to src/synfig/valuenodes/valuenode_gradientrotate.h
index 65e34b6..3ecfa7b 100644
--- a/src/synfig/valuenode_gradientrotate.h
+++ b/src/synfig/valuenodes/valuenode_gradientrotate.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_greyed.cpp b/src/synfig/valuenodes/valuenode_greyed.cpp
similarity index 100%
rename from src/synfig/valuenode_greyed.cpp
rename to src/synfig/valuenodes/valuenode_greyed.cpp
diff --git a/src/synfig/valuenode_greyed.h b/src/synfig/valuenodes/valuenode_greyed.h
similarity index 100%
rename from src/synfig/valuenode_greyed.h
rename to src/synfig/valuenodes/valuenode_greyed.h
diff --git a/src/synfig/valuenode_integer.cpp b/src/synfig/valuenodes/valuenode_integer.cpp
similarity index 97%
rename from src/synfig/valuenode_integer.cpp
rename to src/synfig/valuenodes/valuenode_integer.cpp
index 0a03783..b7609fd 100644
--- a/src/synfig/valuenode_integer.cpp
+++ b/src/synfig/valuenodes/valuenode_integer.cpp
@@ -34,7 +34,7 @@
 
 #include "valuenode_integer.h"
 #include "valuenode_const.h"
-#include "general.h"
+#include <synfig/general.h>
 #include <ETL/misc>
 
 #endif
@@ -146,13 +146,13 @@ ValueNode_Integer::operator()(Time t)const
 ValueBase
 synfig::ValueNode_Integer::get_inverse(Time /*t*/, const synfig::Real &target_value) const
 {
-	return (int)target_value;
+	return (int)round(target_value);
 }
 
 synfig::ValueBase
 synfig::ValueNode_Integer::get_inverse(Time /*t*/, const synfig::Angle &target_value) const
 {
-	return (int)Angle::deg(target_value).get();
+	return (int)round(Angle::deg(target_value).get());
 }
 
 
diff --git a/src/synfig/valuenode_integer.h b/src/synfig/valuenodes/valuenode_integer.h
similarity index 98%
rename from src/synfig/valuenode_integer.h
rename to src/synfig/valuenodes/valuenode_integer.h
index eec7e77..cf60375 100644
--- a/src/synfig/valuenode_integer.h
+++ b/src/synfig/valuenodes/valuenode_integer.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_intstring.cpp b/src/synfig/valuenodes/valuenode_intstring.cpp
similarity index 98%
rename from src/synfig/valuenode_intstring.cpp
rename to src/synfig/valuenodes/valuenode_intstring.cpp
index 91e298b..7b5f821 100644
--- a/src/synfig/valuenode_intstring.cpp
+++ b/src/synfig/valuenodes/valuenode_intstring.cpp
@@ -33,8 +33,8 @@
 
 #include "valuenode_intstring.h"
 #include "valuenode_const.h"
-#include "canvas.h"
-#include "general.h"
+#include <synfig/canvas.h>
+#include <synfig/general.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_intstring.h b/src/synfig/valuenodes/valuenode_intstring.h
similarity index 98%
rename from src/synfig/valuenode_intstring.h
rename to src/synfig/valuenodes/valuenode_intstring.h
index 8e46541..7e398e4 100644
--- a/src/synfig/valuenode_intstring.h
+++ b/src/synfig/valuenodes/valuenode_intstring.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_join.cpp b/src/synfig/valuenodes/valuenode_join.cpp
similarity index 98%
rename from src/synfig/valuenode_join.cpp
rename to src/synfig/valuenodes/valuenode_join.cpp
index 2e27da0..56b1a4b 100644
--- a/src/synfig/valuenode_join.cpp
+++ b/src/synfig/valuenodes/valuenode_join.cpp
@@ -34,8 +34,8 @@
 #include "valuenode_join.h"
 #include "valuenode_const.h"
 #include "valuenode_dynamiclist.h"
-#include "canvas.h"
-#include "general.h"
+#include <synfig/canvas.h>
+#include <synfig/general.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_join.h b/src/synfig/valuenodes/valuenode_join.h
similarity index 98%
rename from src/synfig/valuenode_join.h
rename to src/synfig/valuenodes/valuenode_join.h
index 542ed13..93a8c35 100644
--- a/src/synfig/valuenode_join.h
+++ b/src/synfig/valuenodes/valuenode_join.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_linear.cpp b/src/synfig/valuenodes/valuenode_linear.cpp
similarity index 99%
rename from src/synfig/valuenode_linear.cpp
rename to src/synfig/valuenodes/valuenode_linear.cpp
index 3b05218..7180cc1 100644
--- a/src/synfig/valuenode_linear.cpp
+++ b/src/synfig/valuenodes/valuenode_linear.cpp
@@ -33,8 +33,8 @@
 
 #include "valuenode_linear.h"
 #include "valuenode_const.h"
-#include "general.h"
-#include "color.h"
+#include <synfig/general.h>
+#include <synfig/color.h>
 #include <ETL/misc>
 
 #endif
diff --git a/src/synfig/valuenode_linear.h b/src/synfig/valuenodes/valuenode_linear.h
similarity index 98%
rename from src/synfig/valuenode_linear.h
rename to src/synfig/valuenodes/valuenode_linear.h
index 439698d..8d84787 100644
--- a/src/synfig/valuenode_linear.h
+++ b/src/synfig/valuenodes/valuenode_linear.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_log.cpp b/src/synfig/valuenodes/valuenode_log.cpp
similarity index 99%
rename from src/synfig/valuenode_log.cpp
rename to src/synfig/valuenodes/valuenode_log.cpp
index a447a81..a1081d5 100644
--- a/src/synfig/valuenode_log.cpp
+++ b/src/synfig/valuenodes/valuenode_log.cpp
@@ -33,7 +33,7 @@
 
 #include "valuenode_log.h"
 #include "valuenode_const.h"
-#include "general.h"
+#include <synfig/general.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_log.h b/src/synfig/valuenodes/valuenode_log.h
similarity index 98%
copy from src/synfig/valuenode_log.h
copy to src/synfig/valuenodes/valuenode_log.h
index e9024f1..08579a9 100644
--- a/src/synfig/valuenode_log.h
+++ b/src/synfig/valuenodes/valuenode_log.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_not.cpp b/src/synfig/valuenodes/valuenode_not.cpp
similarity index 99%
rename from src/synfig/valuenode_not.cpp
rename to src/synfig/valuenodes/valuenode_not.cpp
index fdd817a..242f1c7 100644
--- a/src/synfig/valuenode_not.cpp
+++ b/src/synfig/valuenodes/valuenode_not.cpp
@@ -34,7 +34,7 @@
 
 #include "valuenode_not.h"
 #include "valuenode_const.h"
-#include "general.h"
+#include <synfig/general.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_not.h b/src/synfig/valuenodes/valuenode_not.h
similarity index 98%
rename from src/synfig/valuenode_not.h
rename to src/synfig/valuenodes/valuenode_not.h
index a0c7680..c1a30df 100644
--- a/src/synfig/valuenode_not.h
+++ b/src/synfig/valuenodes/valuenode_not.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_or.cpp b/src/synfig/valuenodes/valuenode_or.cpp
similarity index 99%
rename from src/synfig/valuenode_or.cpp
rename to src/synfig/valuenodes/valuenode_or.cpp
index 1500852..e4897b8 100644
--- a/src/synfig/valuenode_or.cpp
+++ b/src/synfig/valuenodes/valuenode_or.cpp
@@ -34,7 +34,7 @@
 
 #include "valuenode_or.h"
 #include "valuenode_const.h"
-#include "general.h"
+#include <synfig/general.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_or.h b/src/synfig/valuenodes/valuenode_or.h
similarity index 98%
rename from src/synfig/valuenode_or.h
rename to src/synfig/valuenodes/valuenode_or.h
index 8501a29..af9d2ff 100644
--- a/src/synfig/valuenode_or.h
+++ b/src/synfig/valuenodes/valuenode_or.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_pow.cpp b/src/synfig/valuenodes/valuenode_pow.cpp
similarity index 99%
rename from src/synfig/valuenode_pow.cpp
rename to src/synfig/valuenodes/valuenode_pow.cpp
index c0cd338..82c0b40 100644
--- a/src/synfig/valuenode_pow.cpp
+++ b/src/synfig/valuenodes/valuenode_pow.cpp
@@ -34,7 +34,7 @@
 
 #include "valuenode_pow.h"
 #include "valuenode_const.h"
-#include "general.h"
+#include <synfig/general.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_pow.h b/src/synfig/valuenodes/valuenode_pow.h
similarity index 98%
rename from src/synfig/valuenode_pow.h
rename to src/synfig/valuenodes/valuenode_pow.h
index 29133c0..b431879 100644
--- a/src/synfig/valuenode_pow.h
+++ b/src/synfig/valuenodes/valuenode_pow.h
@@ -30,7 +30,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_radialcomposite.cpp b/src/synfig/valuenodes/valuenode_radialcomposite.cpp
similarity index 98%
rename from src/synfig/valuenode_radialcomposite.cpp
rename to src/synfig/valuenodes/valuenode_radialcomposite.cpp
index 6c74f5f..d3a5eb7 100644
--- a/src/synfig/valuenode_radialcomposite.cpp
+++ b/src/synfig/valuenodes/valuenode_radialcomposite.cpp
@@ -34,9 +34,9 @@
 #include "valuenode_radialcomposite.h"
 #include "valuenode_const.h"
 #include <stdexcept>
-#include "general.h"
-#include "color.h"
-#include "savecanvas.h"
+#include <synfig/general.h>
+#include <synfig/color.h>
+#include <synfig/savecanvas.h>
 #endif
 
 /* === U S I N G =========================================================== */
diff --git a/src/synfig/valuenode_radialcomposite.h b/src/synfig/valuenodes/valuenode_radialcomposite.h
similarity index 98%
rename from src/synfig/valuenode_radialcomposite.h
rename to src/synfig/valuenodes/valuenode_radialcomposite.h
index 28e2fff..1109638 100644
--- a/src/synfig/valuenode_radialcomposite.h
+++ b/src/synfig/valuenodes/valuenode_radialcomposite.h
@@ -28,7 +28,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_range.cpp b/src/synfig/valuenodes/valuenode_range.cpp
similarity index 98%
rename from src/synfig/valuenode_range.cpp
rename to src/synfig/valuenodes/valuenode_range.cpp
index 26fd4f4..f60dfde 100644
--- a/src/synfig/valuenode_range.cpp
+++ b/src/synfig/valuenodes/valuenode_range.cpp
@@ -31,13 +31,13 @@
 #	include <config.h>
 #endif
 
-#include "general.h"
+#include <synfig/general.h>
 #include "valuenode_range.h"
 #include "valuenode_const.h"
 #include <stdexcept>
-#include "vector.h"
-#include "angle.h"
-#include "real.h"
+#include <synfig/vector.h>
+#include <synfig/angle.h>
+#include <synfig/real.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_range.h b/src/synfig/valuenodes/valuenode_range.h
similarity index 98%
rename from src/synfig/valuenode_range.h
rename to src/synfig/valuenodes/valuenode_range.h
index 02ac732..ab6513a 100644
--- a/src/synfig/valuenode_range.h
+++ b/src/synfig/valuenodes/valuenode_range.h
@@ -28,7 +28,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_real.cpp b/src/synfig/valuenodes/valuenode_real.cpp
similarity index 94%
rename from src/synfig/valuenode_real.cpp
rename to src/synfig/valuenodes/valuenode_real.cpp
index cb163b5..a41103c 100644
--- a/src/synfig/valuenode_real.cpp
+++ b/src/synfig/valuenodes/valuenode_real.cpp
@@ -34,7 +34,7 @@
 
 #include "valuenode_real.h"
 #include "valuenode_const.h"
-#include "general.h"
+#include <synfig/general.h>
 #include <ETL/misc>
 
 #endif
@@ -73,6 +73,9 @@ ValueNode_Real::ValueNode_Real(const ValueBase &x):
 	if (type == type_integer)
 		set_link("link", ValueNode_Const::create(float(x.get(int()))));
 	else
+	if (type == type_time)
+		set_link("link", ValueNode_Const::create(float(x.get(Time()))));
+	else
 	{
 		assert(0);
 		throw runtime_error(get_local_name()+_(":Bad type ")+x.get_type().description.local_name);
@@ -133,6 +136,8 @@ ValueNode_Real::operator()(Time t)const
 		return bool(real);
 	if (type == type_integer)
 		return int(real);
+	if (type == type_time)
+		return Time(real);
 
 	assert(0);
 	throw runtime_error(get_local_name()+_(":Bad type ")+get_type().description.local_name);
@@ -162,9 +167,10 @@ bool
 ValueNode_Real::check_type(Type &type __attribute__ ((unused)))
 {
 	return
-		type==type_angle ||
-		type==type_bool  ||
-		type==type_integer;
+		type==type_angle   ||
+		type==type_bool    ||
+		type==type_integer ||
+		type==type_time;
 }
 
 LinkableValueNode::Vocab
diff --git a/src/synfig/valuenode_real.h b/src/synfig/valuenodes/valuenode_real.h
similarity index 98%
rename from src/synfig/valuenode_real.h
rename to src/synfig/valuenodes/valuenode_real.h
index 004adae..0615362 100644
--- a/src/synfig/valuenode_real.h
+++ b/src/synfig/valuenodes/valuenode_real.h
@@ -30,7 +30,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_realstring.cpp b/src/synfig/valuenodes/valuenode_realstring.cpp
similarity index 98%
rename from src/synfig/valuenode_realstring.cpp
rename to src/synfig/valuenodes/valuenode_realstring.cpp
index adba91c..b742ab2 100644
--- a/src/synfig/valuenode_realstring.cpp
+++ b/src/synfig/valuenodes/valuenode_realstring.cpp
@@ -33,8 +33,8 @@
 
 #include "valuenode_realstring.h"
 #include "valuenode_const.h"
-#include "canvas.h"
-#include "general.h"
+#include <synfig/canvas.h>
+#include <synfig/general.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_realstring.h b/src/synfig/valuenodes/valuenode_realstring.h
similarity index 98%
rename from src/synfig/valuenode_realstring.h
rename to src/synfig/valuenodes/valuenode_realstring.h
index bab6ece..6d1df66 100644
--- a/src/synfig/valuenode_realstring.h
+++ b/src/synfig/valuenodes/valuenode_realstring.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_reciprocal.cpp b/src/synfig/valuenodes/valuenode_reciprocal.cpp
similarity index 99%
rename from src/synfig/valuenode_reciprocal.cpp
rename to src/synfig/valuenodes/valuenode_reciprocal.cpp
index aeb7b25..6d18ef8 100644
--- a/src/synfig/valuenode_reciprocal.cpp
+++ b/src/synfig/valuenodes/valuenode_reciprocal.cpp
@@ -33,7 +33,7 @@
 
 #include "valuenode_reciprocal.h"
 #include "valuenode_const.h"
-#include "general.h"
+#include <synfig/general.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_reciprocal.h b/src/synfig/valuenodes/valuenode_reciprocal.h
similarity index 98%
rename from src/synfig/valuenode_reciprocal.h
rename to src/synfig/valuenodes/valuenode_reciprocal.h
index 1e85830..e98986e 100644
--- a/src/synfig/valuenode_reciprocal.h
+++ b/src/synfig/valuenodes/valuenode_reciprocal.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_reference.cpp b/src/synfig/valuenodes/valuenode_reference.cpp
similarity index 99%
rename from src/synfig/valuenode_reference.cpp
rename to src/synfig/valuenodes/valuenode_reference.cpp
index 419b056..07a816f 100644
--- a/src/synfig/valuenode_reference.cpp
+++ b/src/synfig/valuenodes/valuenode_reference.cpp
@@ -33,7 +33,7 @@
 
 #include "valuenode_reference.h"
 #include "valuenode_const.h"
-#include "general.h"
+#include <synfig/general.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_reference.h b/src/synfig/valuenodes/valuenode_reference.h
similarity index 98%
rename from src/synfig/valuenode_reference.h
rename to src/synfig/valuenodes/valuenode_reference.h
index fbdef4d..3b3fdcf 100644
--- a/src/synfig/valuenode_reference.h
+++ b/src/synfig/valuenodes/valuenode_reference.h
@@ -28,7 +28,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_repeat_gradient.cpp b/src/synfig/valuenodes/valuenode_repeat_gradient.cpp
similarity index 98%
rename from src/synfig/valuenode_repeat_gradient.cpp
rename to src/synfig/valuenodes/valuenode_repeat_gradient.cpp
index 837ae87..2061a77 100644
--- a/src/synfig/valuenode_repeat_gradient.cpp
+++ b/src/synfig/valuenodes/valuenode_repeat_gradient.cpp
@@ -31,12 +31,12 @@
 #	include <config.h>
 #endif
 
-#include "general.h"
+#include <synfig/general.h>
 #include "valuenode_repeat_gradient.h"
 #include "valuenode_const.h"
 #include <stdexcept>
-#include "color.h"
-#include "gradient.h"
+#include <synfig/color.h>
+#include <synfig/gradient.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_repeat_gradient.h b/src/synfig/valuenodes/valuenode_repeat_gradient.h
similarity index 98%
rename from src/synfig/valuenode_repeat_gradient.h
rename to src/synfig/valuenodes/valuenode_repeat_gradient.h
index c48a503..2f2c234 100644
--- a/src/synfig/valuenode_repeat_gradient.h
+++ b/src/synfig/valuenodes/valuenode_repeat_gradient.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenodes/valuenode_reverse.cpp b/src/synfig/valuenodes/valuenode_reverse.cpp
new file mode 100644
index 0000000..0b93eac
--- /dev/null
+++ b/src/synfig/valuenodes/valuenode_reverse.cpp
@@ -0,0 +1,312 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file ValueNode_Reverse.cpp
+**	\brief Implementation of the "Reverse" valuenode conversion.
+**
+**	$Id$
+**
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 2008 Chris Moore
+**	Copyright (c) 2011 Carlos López
+**	Copyright (c) 2013 Konstantin Dmitriev
+**	Copyright (c) 2015 Max May
+**
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
+**
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
+**	\endlegal
+*/
+/* ========================================================================= */
+
+/* === H E A D E R S ======================================================= */
+
+#ifdef USING_PCH
+#	include "pch.h"
+#else
+#ifdef HAVE_CONFIG_H
+#	include <config.h>
+#endif
+
+#include "valuenode_reverse.h"
+#include <synfig/segment.h>
+#include <synfig/gradient.h>
+#include <synfig/blinepoint.h>
+
+#include "valuenode_bline.h"
+#include "valuenode_dilist.h"
+#include "valuenode_wplist.h"
+#include "valuenode_dynamiclist.h"
+#include "valuenode_composite.h"
+#include "valuenode_const.h"
+
+#include <synfig/general.h>
+#include <ETL/misc>
+
+#include <algorithm>
+
+#endif
+
+/* === U S I N G =========================================================== */
+
+using namespace std;
+using namespace etl;
+using namespace synfig;
+
+/* === M A C R O S ========================================================= */
+
+/* === G L O B A L S ======================================================= */
+
+/* === P R O C E D U R E S ================================================= */
+
+/* === M E T H O D S ======================================================= */
+
+ValueNode_Reverse::ValueNode_Reverse(Type &x):
+	LinkableValueNode(x)
+{
+}
+
+ValueNode_Reverse::ValueNode_Reverse(const ValueBase &x):
+	LinkableValueNode(x.get_type())
+{
+	Vocab ret(get_children_vocab());
+	set_children_vocab(ret);
+	Type &type(x.get_type());
+	if(x.empty()) {
+		set_link("link", ValueNode_Const::create(x));
+	}
+	else
+	if(type == type_list)
+	{
+		Type &c_type(x.get_contained_type());
+		if(c_type == type_bline_point)
+			set_link("link", ValueNode_BLine::create(x));
+		else if(c_type == type_dash_item)
+			set_link("link", ValueNode_DIList::create(x));
+		else if(c_type == type_width_point)
+			set_link("link", ValueNode_WPList::create(x));
+		else
+			set_link("link", ValueNode_DynamicList::create_from(x));
+	}
+	else
+	if(ValueNode_Composite::check_type(type)) {
+		set_link("link", ValueNode_Composite::create(x));
+	}
+	else
+	{
+		set_link("link", ValueNode_Const::create(x));
+	}
+}
+
+ValueNode_Reverse*
+ValueNode_Reverse::create(const ValueBase &x)
+{
+	return new ValueNode_Reverse(x);
+}
+
+LinkableValueNode*
+ValueNode_Reverse::create_new()const
+{
+	return new ValueNode_Reverse(get_type());
+}
+
+ValueNode_Reverse::~ValueNode_Reverse()
+{
+	unlink_all();
+}
+
+bool
+ValueNode_Reverse::set_link_vfunc(int i,ValueNode::Handle value)
+{
+	assert(i>=0 && i<link_count());
+
+	switch(i)
+	{
+	case 0: CHECK_TYPE_AND_SET_VALUE(link_, get_type());
+	}
+	return false;
+}
+
+ValueNode::LooseHandle
+ValueNode_Reverse::get_link_vfunc(int i)const
+{
+	assert(i>=0 && i<link_count());
+
+	if(i==0) return link_;
+
+	return 0;
+}
+
+ValueBase
+reverse_value(const ValueBase &value)
+{
+	Type &type(value.get_type());
+
+	if(type == type_list)
+	{
+		// We'll be writing to this later, so copy it.
+		ValueBase v = value;
+		const ValueBase::List &list = v.get_list();
+		ValueBase::List out;
+		Type &c_type(v.get_contained_type());
+		if(ValueNode_Reverse::check_type(c_type))
+		{
+			// This is a "deep" reversal, so reverse the elements of the list, too.
+
+			out.reserve(list.size());
+
+			if(!v.get_loop())
+			{
+				for(ValueBase::List::const_reverse_iterator it=list.rbegin(),end=list.rend(); it!=end; ++it)
+				{
+					out.push_back(reverse_value(*it));
+				}
+			}
+			else
+			{
+				// The reversal of a looped list is rotated to end with the same value as the original.
+				// This makes some things work better, e.g. makes an adv. outline come out looking the same
+				// after having both its vertices and its width points reversed.
+				for(ValueBase::List::const_reverse_iterator it=++list.rbegin(),end=list.rend(); it!=end; ++it)
+				{
+					out.push_back(reverse_value(*it));
+				}
+				out.push_back(reverse_value(list.back()));
+			}
+
+			if(c_type == type_dash_item)
+			{
+				// Dash items need to exchange offsets with their neighbors to work right.
+				Real prev = out.back().get(DashItem()).get_offset();
+				for(ValueBase::List::iterator it=out.begin(),end=out.end(); it!=end; ++it)
+				{
+					DashItem di = it->get(DashItem());
+					Real tmp = di.get_offset();
+					di.set_offset(prev);
+					prev = tmp;
+					it->set(di);
+				}
+			}
+		}
+		else
+		{
+			// The elements aren't reversible. Just copy them.
+			out.resize(list.size());
+			std::reverse_copy(list.begin(), list.end(), out.begin());
+		}
+		v.set(out);
+		return v;
+	}
+	else
+	if(type == type_string)
+	{
+		String out = value.get(String());
+		std::reverse(out.begin(), out.end());
+		return out;
+	}
+	else
+	if(type == type_segment)
+	{
+		Segment out = value.get(Segment());
+		std::swap(out.p1, out.p2);
+		std::swap(out.t1, out.t2);
+		return out;
+	}
+	else
+	if(type == type_gradient)
+	{
+		const Gradient &grad = value.get(Gradient());
+		Gradient out;
+		for(Gradient::const_reverse_iterator it=grad.rbegin(),end=grad.rend(); it!=end; ++it)
+		{
+			out.push_back(GradientCPoint(1-it->pos, it->color));
+		}
+		return out;
+	}
+	else
+	if(type == type_bline_point)
+	{
+		BLinePoint bp = value.get(BLinePoint());
+		bp.reverse();
+		return bp;
+	}
+	else
+	if(type == type_width_point)
+	{
+		WidthPoint wp = value.get(WidthPoint());
+		wp.reverse();
+		int tmp = wp.get_side_type_before();
+		wp.set_side_type_before(wp.get_side_type_after());
+		wp.set_side_type_after(tmp);
+		return wp;
+	}
+	else
+	if(type == type_dash_item)
+	{
+		DashItem di = value.get(DashItem());
+		int tmp = di.get_side_type_before();
+		di.set_side_type_before(di.get_side_type_after());
+		di.set_side_type_after(tmp);
+		return di;
+	}
+
+	assert(0);
+	return value;
+}
+
+ValueBase
+ValueNode_Reverse::operator()(Time t)const
+{
+	if (getenv("SYNFIG_DEBUG_VALUENODE_OPERATORS"))
+		printf("%s:%d operator()\n", __FILE__, __LINE__);
+
+	return reverse_value((*link_)(t));
+}
+
+
+
+String
+ValueNode_Reverse::get_name()const
+{
+	return "reverse";
+}
+
+String
+ValueNode_Reverse::get_local_name()const
+{
+	return _("Reverse");
+}
+
+bool
+ValueNode_Reverse::check_type(Type &type __attribute__ ((unused)))
+{
+	return
+		type == type_list ||
+		type == type_string ||
+		type == type_segment ||
+		type == type_gradient ||
+		type == type_bline_point ||
+		type == type_width_point ||
+		type == type_dash_item;
+}
+
+LinkableValueNode::Vocab
+ValueNode_Reverse::get_children_vocab_vfunc()const
+{
+	if(children_vocab.size())
+		return children_vocab;
+
+	LinkableValueNode::Vocab ret;
+
+	ret.push_back(ParamDesc(ValueBase(),"link")
+		.set_local_name(_("Link"))
+		.set_description(_("The value to be reversed"))
+	);
+
+	return ret;
+}
diff --git a/src/synfig/valuenode_log.h b/src/synfig/valuenodes/valuenode_reverse.h
similarity index 71%
rename from src/synfig/valuenode_log.h
rename to src/synfig/valuenodes/valuenode_reverse.h
index e9024f1..b3b6d33 100644
--- a/src/synfig/valuenode_log.h
+++ b/src/synfig/valuenodes/valuenode_reverse.h
@@ -1,13 +1,15 @@
 /* === S Y N F I G ========================================================= */
-/*!	\file valuenode_log.h
-**	\brief Header file for implementation of the "Natural Logarithm" valuenode conversion.
+/*!	\file valuenode_reverse.h
+**	\brief Header file for implementation of the "Reverse" valuenode conversion.
 **
 **	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**	Copyright (c) 2007 Chris Moore
-**  Copyright (c) 2008, 2011 Carlos López
+**	Copyright (c) 2007, 2008 Chris Moore
+**	Copyright (c) 2011 Carlos López
+**	Copyright (c) 2013 Konstantin Dmitriev
+**	Copyright (c) 2015 Max May
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -24,12 +26,12 @@
 
 /* === S T A R T =========================================================== */
 
-#ifndef __SYNFIG_VALUENODE_LOGARITHM_H
-#define __SYNFIG_VALUENODE_LOGARITHM_H
+#ifndef __SYNFIG_VALUENODE_REVERSE_H
+#define __SYNFIG_VALUENODE_REVERSE_H
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
@@ -37,21 +39,20 @@
 
 namespace synfig {
 
-class ValueNode_Logarithm : public LinkableValueNode
+class ValueNode_Reverse : public LinkableValueNode
 {
 	ValueNode::RHandle link_;
-	ValueNode::RHandle epsilon_;
-	ValueNode::RHandle infinite_;
 
 public:
-	typedef etl::handle<ValueNode_Logarithm> Handle;
-	typedef etl::handle<const ValueNode_Logarithm> ConstHandle;
+	typedef etl::handle<ValueNode_Reverse> Handle;
+	typedef etl::handle<const ValueNode_Reverse> ConstHandle;
 
-	ValueNode_Logarithm(const ValueBase &x);
+	ValueNode_Reverse(Type &x);
+	ValueNode_Reverse(const ValueBase &x);
 
 	virtual ValueBase operator()(Time t)const;
 
-	virtual ~ValueNode_Logarithm();
+	virtual ~ValueNode_Reverse();
 
 	virtual String get_name()const;
 	virtual String get_local_name()const;
@@ -67,14 +68,12 @@ public:
 
 	using synfig::LinkableValueNode::set_link_vfunc;
 	static bool check_type(Type &type);
-	static ValueNode_Logarithm* create(const ValueBase &x);
+	static ValueNode_Reverse* create(const ValueBase &x);
 	virtual Vocab get_children_vocab_vfunc()const;
-}; // END of class ValueNode_Logarithm
+}; // END of class ValueNode_Reverse
 
 }; // END of namespace synfig
 
 /* === E N D =============================================================== */
 
 #endif
-
-
diff --git a/src/synfig/valuenode_scale.cpp b/src/synfig/valuenodes/valuenode_scale.cpp
similarity index 98%
rename from src/synfig/valuenode_scale.cpp
rename to src/synfig/valuenodes/valuenode_scale.cpp
index 752690b..b83304d 100644
--- a/src/synfig/valuenode_scale.cpp
+++ b/src/synfig/valuenodes/valuenode_scale.cpp
@@ -31,14 +31,14 @@
 #	include <config.h>
 #endif
 
-#include "general.h"
+#include <synfig/general.h>
 #include "valuenode_scale.h"
 #include "valuenode_const.h"
 #include <stdexcept>
-#include "color.h"
-#include "vector.h"
-#include "time.h"
-#include "angle.h"
+#include <synfig/color.h>
+#include <synfig/vector.h>
+#include <synfig/time.h>
+#include <synfig/angle.h>
 #include <ETL/misc>
 
 #endif
diff --git a/src/synfig/valuenode_scale.h b/src/synfig/valuenodes/valuenode_scale.h
similarity index 98%
rename from src/synfig/valuenode_scale.h
rename to src/synfig/valuenodes/valuenode_scale.h
index 92f0545..5a13a26 100644
--- a/src/synfig/valuenode_scale.h
+++ b/src/synfig/valuenodes/valuenode_scale.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_segcalctangent.cpp b/src/synfig/valuenodes/valuenode_segcalctangent.cpp
similarity index 97%
rename from src/synfig/valuenode_segcalctangent.cpp
rename to src/synfig/valuenodes/valuenode_segcalctangent.cpp
index 8e8d6d1..ca54832 100644
--- a/src/synfig/valuenode_segcalctangent.cpp
+++ b/src/synfig/valuenodes/valuenode_segcalctangent.cpp
@@ -34,11 +34,11 @@
 #include "valuenode_segcalctangent.h"
 #include "valuenode_const.h"
 #include "valuenode_composite.h"
-#include "general.h"
-#include "exception.h"
+#include <synfig/general.h>
+#include <synfig/exception.h>
 #include <ETL/hermite>
 #include <ETL/calculus>
-#include "segment.h"
+#include <synfig/segment.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_segcalctangent.h b/src/synfig/valuenodes/valuenode_segcalctangent.h
similarity index 98%
rename from src/synfig/valuenode_segcalctangent.h
rename to src/synfig/valuenodes/valuenode_segcalctangent.h
index 666fb2e..1a1632d 100644
--- a/src/synfig/valuenode_segcalctangent.h
+++ b/src/synfig/valuenodes/valuenode_segcalctangent.h
@@ -28,7 +28,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_segcalcvertex.cpp b/src/synfig/valuenodes/valuenode_segcalcvertex.cpp
similarity index 97%
rename from src/synfig/valuenode_segcalcvertex.cpp
rename to src/synfig/valuenodes/valuenode_segcalcvertex.cpp
index 89eebb6..f7b2ef5 100644
--- a/src/synfig/valuenode_segcalcvertex.cpp
+++ b/src/synfig/valuenodes/valuenode_segcalcvertex.cpp
@@ -34,10 +34,10 @@
 #include "valuenode_segcalcvertex.h"
 #include "valuenode_const.h"
 #include "valuenode_composite.h"
-#include "general.h"
-#include "exception.h"
+#include <synfig/general.h>
+#include <synfig/exception.h>
 #include <ETL/hermite>
-#include "segment.h"
+#include <synfig/segment.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_segcalcvertex.h b/src/synfig/valuenodes/valuenode_segcalcvertex.h
similarity index 98%
rename from src/synfig/valuenode_segcalcvertex.h
rename to src/synfig/valuenodes/valuenode_segcalcvertex.h
index 4d00ec3..0a5bf90 100644
--- a/src/synfig/valuenode_segcalcvertex.h
+++ b/src/synfig/valuenodes/valuenode_segcalcvertex.h
@@ -28,7 +28,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_sine.cpp b/src/synfig/valuenodes/valuenode_sine.cpp
similarity index 99%
rename from src/synfig/valuenode_sine.cpp
rename to src/synfig/valuenodes/valuenode_sine.cpp
index 1f9ac4e..96e424a 100644
--- a/src/synfig/valuenode_sine.cpp
+++ b/src/synfig/valuenodes/valuenode_sine.cpp
@@ -33,7 +33,7 @@
 
 #include "valuenode_sine.h"
 #include "valuenode_const.h"
-#include "general.h"
+#include <synfig/general.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_sine.h b/src/synfig/valuenodes/valuenode_sine.h
similarity index 98%
rename from src/synfig/valuenode_sine.h
rename to src/synfig/valuenodes/valuenode_sine.h
index a03ec06..564a609 100644
--- a/src/synfig/valuenode_sine.h
+++ b/src/synfig/valuenodes/valuenode_sine.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_staticlist.cpp b/src/synfig/valuenodes/valuenode_staticlist.cpp
similarity index 99%
rename from src/synfig/valuenode_staticlist.cpp
rename to src/synfig/valuenodes/valuenode_staticlist.cpp
index a1890b3..a78130b 100644
--- a/src/synfig/valuenode_staticlist.cpp
+++ b/src/synfig/valuenodes/valuenode_staticlist.cpp
@@ -34,14 +34,14 @@
 #include "valuenode_const.h"
 #include "valuenode_composite.h"
 #include "valuenode_bone.h"
-#include "boneweightpair.h"
-#include "general.h"
-#include "exception.h"
+#include <synfig/boneweightpair.h>
+#include <synfig/general.h>
+#include <synfig/exception.h>
 #include <vector>
 #include <list>
 #include <algorithm>
-#include "canvas.h"
-#include "pair.h"
+#include <synfig/canvas.h>
+#include <synfig/pair.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_staticlist.h b/src/synfig/valuenodes/valuenode_staticlist.h
similarity index 98%
rename from src/synfig/valuenode_staticlist.h
rename to src/synfig/valuenodes/valuenode_staticlist.h
index 04604be..772a9c7 100644
--- a/src/synfig/valuenode_staticlist.h
+++ b/src/synfig/valuenodes/valuenode_staticlist.h
@@ -30,9 +30,9 @@
 #include <vector>
 #include <list>
 
-#include "valuenode.h"
-#include "time.h"
-#include "uniqueid.h"
+#include <synfig/valuenode.h>
+#include <synfig/time.h>
+#include <synfig/uniqueid.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_step.cpp b/src/synfig/valuenodes/valuenode_step.cpp
similarity index 99%
rename from src/synfig/valuenode_step.cpp
rename to src/synfig/valuenodes/valuenode_step.cpp
index 1763984..8caa30a 100644
--- a/src/synfig/valuenode_step.cpp
+++ b/src/synfig/valuenodes/valuenode_step.cpp
@@ -32,8 +32,8 @@
 
 #include "valuenode_step.h"
 #include "valuenode_const.h"
-#include "general.h"
-#include "color.h"
+#include <synfig/general.h>
+#include <synfig/color.h>
 #include <ETL/misc>
 
 #endif
diff --git a/src/synfig/valuenode_step.h b/src/synfig/valuenodes/valuenode_step.h
similarity index 98%
rename from src/synfig/valuenode_step.h
rename to src/synfig/valuenodes/valuenode_step.h
index 35c6168..bb53187 100644
--- a/src/synfig/valuenode_step.h
+++ b/src/synfig/valuenodes/valuenode_step.h
@@ -28,7 +28,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_stripes.cpp b/src/synfig/valuenodes/valuenode_stripes.cpp
similarity index 98%
rename from src/synfig/valuenode_stripes.cpp
rename to src/synfig/valuenodes/valuenode_stripes.cpp
index 708cd3b..a1ee3c0 100644
--- a/src/synfig/valuenode_stripes.cpp
+++ b/src/synfig/valuenodes/valuenode_stripes.cpp
@@ -31,12 +31,12 @@
 #	include <config.h>
 #endif
 
-#include "general.h"
+#include <synfig/general.h>
 #include "valuenode_stripes.h"
 #include "valuenode_const.h"
 #include <stdexcept>
-#include "color.h"
-#include "gradient.h"
+#include <synfig/color.h>
+#include <synfig/gradient.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_stripes.h b/src/synfig/valuenodes/valuenode_stripes.h
similarity index 98%
rename from src/synfig/valuenode_stripes.h
rename to src/synfig/valuenodes/valuenode_stripes.h
index af2c2bf..493c6d1 100644
--- a/src/synfig/valuenode_stripes.h
+++ b/src/synfig/valuenodes/valuenode_stripes.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_subtract.cpp b/src/synfig/valuenodes/valuenode_subtract.cpp
similarity index 97%
rename from src/synfig/valuenode_subtract.cpp
rename to src/synfig/valuenodes/valuenode_subtract.cpp
index 29812f4..8a7d60f 100644
--- a/src/synfig/valuenode_subtract.cpp
+++ b/src/synfig/valuenodes/valuenode_subtract.cpp
@@ -31,15 +31,15 @@
 #	include <config.h>
 #endif
 
-#include "general.h"
+#include <synfig/general.h>
 #include "valuenode_subtract.h"
 #include "valuenode_const.h"
 #include <stdexcept>
-#include "color.h"
-#include "gradient.h"
-#include "vector.h"
-#include "angle.h"
-#include "real.h"
+#include <synfig/color.h>
+#include <synfig/gradient.h>
+#include <synfig/vector.h>
+#include <synfig/angle.h>
+#include <synfig/real.h>
 #include <ETL/misc>
 
 #endif
diff --git a/src/synfig/valuenode_subtract.h b/src/synfig/valuenodes/valuenode_subtract.h
similarity index 98%
rename from src/synfig/valuenode_subtract.h
rename to src/synfig/valuenodes/valuenode_subtract.h
index 91c1f11..aa5c44d 100644
--- a/src/synfig/valuenode_subtract.h
+++ b/src/synfig/valuenodes/valuenode_subtract.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_switch.cpp b/src/synfig/valuenodes/valuenode_switch.cpp
similarity index 93%
rename from src/synfig/valuenode_switch.cpp
rename to src/synfig/valuenodes/valuenode_switch.cpp
index d27da37..572aa2a 100644
--- a/src/synfig/valuenode_switch.cpp
+++ b/src/synfig/valuenodes/valuenode_switch.cpp
@@ -33,7 +33,7 @@
 
 #include "valuenode_switch.h"
 #include "valuenode_const.h"
-#include "general.h"
+#include <synfig/general.h>
 
 #endif
 
@@ -56,20 +56,20 @@ ValueNode_Switch::ValueNode_Switch(Type &x):
 {
 }
 
-ValueNode_Switch::ValueNode_Switch(const ValueNode::Handle &x):
-	LinkableValueNode(x->get_type())
+ValueNode_Switch::ValueNode_Switch(const ValueBase &x):
+	LinkableValueNode(x.get_type())
 {
 	Vocab ret(get_children_vocab());
 	set_children_vocab(ret);
-	set_link("link_off",x);
-	set_link("link_on",x);
+	set_link("link_off",ValueNode_Const::create(x));
+	set_link("link_on",ValueNode_Const::create(x));
 	set_link("switch",ValueNode_Const::create(bool(false)));
 }
 
 ValueNode_Switch*
 ValueNode_Switch::create(const ValueBase &x)
 {
-	return new ValueNode_Switch(ValueNode_Const::create(x));
+	return new ValueNode_Switch(x);
 }
 
 LinkableValueNode*
diff --git a/src/synfig/valuenode_switch.h b/src/synfig/valuenodes/valuenode_switch.h
similarity index 97%
rename from src/synfig/valuenode_switch.h
rename to src/synfig/valuenodes/valuenode_switch.h
index 0af9a72..2a3484e 100644
--- a/src/synfig/valuenode_switch.h
+++ b/src/synfig/valuenodes/valuenode_switch.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
@@ -48,7 +48,7 @@ public:
 
 	ValueNode_Switch(Type &x);
 
-	ValueNode_Switch(const ValueNode::Handle &x);
+	ValueNode_Switch(const ValueBase &x);
 
 //	static Handle create(Type &x);
 //	static Handle create(const ValueNode::Handle &x);
diff --git a/src/synfig/valuenode_timedswap.cpp b/src/synfig/valuenodes/valuenode_timedswap.cpp
similarity index 99%
rename from src/synfig/valuenode_timedswap.cpp
rename to src/synfig/valuenodes/valuenode_timedswap.cpp
index b60a94d..657c491 100644
--- a/src/synfig/valuenode_timedswap.cpp
+++ b/src/synfig/valuenodes/valuenode_timedswap.cpp
@@ -31,11 +31,11 @@
 #	include <config.h>
 #endif
 
-#include "general.h"
+#include <synfig/general.h>
 #include "valuenode_timedswap.h"
 #include "valuenode_const.h"
 #include <stdexcept>
-#include "color.h"
+#include <synfig/color.h>
 #include <ETL/misc>
 
 #endif
diff --git a/src/synfig/valuenode_timedswap.h b/src/synfig/valuenodes/valuenode_timedswap.h
similarity index 98%
rename from src/synfig/valuenode_timedswap.h
rename to src/synfig/valuenodes/valuenode_timedswap.h
index 3bbd9c6..610d701 100644
--- a/src/synfig/valuenode_timedswap.h
+++ b/src/synfig/valuenodes/valuenode_timedswap.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_timeloop.cpp b/src/synfig/valuenodes/valuenode_timeloop.cpp
similarity index 99%
rename from src/synfig/valuenode_timeloop.cpp
rename to src/synfig/valuenodes/valuenode_timeloop.cpp
index 8b3e957..5970d8f 100644
--- a/src/synfig/valuenode_timeloop.cpp
+++ b/src/synfig/valuenodes/valuenode_timeloop.cpp
@@ -33,7 +33,7 @@
 
 #include "valuenode_timeloop.h"
 #include "valuenode_const.h"
-#include "general.h"
+#include <synfig/general.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_timeloop.h b/src/synfig/valuenodes/valuenode_timeloop.h
similarity index 98%
rename from src/synfig/valuenode_timeloop.h
rename to src/synfig/valuenodes/valuenode_timeloop.h
index d3345db..1248acd 100644
--- a/src/synfig/valuenode_timeloop.h
+++ b/src/synfig/valuenodes/valuenode_timeloop.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_timestring.cpp b/src/synfig/valuenodes/valuenode_timestring.cpp
similarity index 98%
rename from src/synfig/valuenode_timestring.cpp
rename to src/synfig/valuenodes/valuenode_timestring.cpp
index 9628943..f1f19d6 100644
--- a/src/synfig/valuenode_timestring.cpp
+++ b/src/synfig/valuenodes/valuenode_timestring.cpp
@@ -33,8 +33,8 @@
 
 #include "valuenode_timestring.h"
 #include "valuenode_const.h"
-#include "canvas.h"
-#include "general.h"
+#include <synfig/canvas.h>
+#include <synfig/general.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_timestring.h b/src/synfig/valuenodes/valuenode_timestring.h
similarity index 98%
rename from src/synfig/valuenode_timestring.h
rename to src/synfig/valuenodes/valuenode_timestring.h
index f3fa680..3d33348 100644
--- a/src/synfig/valuenode_timestring.h
+++ b/src/synfig/valuenodes/valuenode_timestring.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_twotone.cpp b/src/synfig/valuenodes/valuenode_twotone.cpp
similarity index 97%
rename from src/synfig/valuenode_twotone.cpp
rename to src/synfig/valuenodes/valuenode_twotone.cpp
index 1e110d0..d4052b1 100644
--- a/src/synfig/valuenode_twotone.cpp
+++ b/src/synfig/valuenodes/valuenode_twotone.cpp
@@ -31,12 +31,12 @@
 #	include <config.h>
 #endif
 
-#include "general.h"
+#include <synfig/general.h>
 #include "valuenode_twotone.h"
 #include "valuenode_const.h"
 #include <stdexcept>
-#include "color.h"
-#include "gradient.h"
+#include <synfig/color.h>
+#include <synfig/gradient.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_twotone.h b/src/synfig/valuenodes/valuenode_twotone.h
similarity index 98%
rename from src/synfig/valuenode_twotone.h
rename to src/synfig/valuenodes/valuenode_twotone.h
index f5b5cee..62b51fe 100644
--- a/src/synfig/valuenode_twotone.h
+++ b/src/synfig/valuenodes/valuenode_twotone.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_vectorangle.cpp b/src/synfig/valuenodes/valuenode_vectorangle.cpp
similarity index 99%
rename from src/synfig/valuenode_vectorangle.cpp
rename to src/synfig/valuenodes/valuenode_vectorangle.cpp
index 8997bd9..b40edca 100644
--- a/src/synfig/valuenode_vectorangle.cpp
+++ b/src/synfig/valuenodes/valuenode_vectorangle.cpp
@@ -33,7 +33,7 @@
 
 #include "valuenode_vectorangle.h"
 #include "valuenode_const.h"
-#include "general.h"
+#include <synfig/general.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_vectorangle.h b/src/synfig/valuenodes/valuenode_vectorangle.h
similarity index 98%
rename from src/synfig/valuenode_vectorangle.h
rename to src/synfig/valuenodes/valuenode_vectorangle.h
index 046c0b1..f74a3c4 100644
--- a/src/synfig/valuenode_vectorangle.h
+++ b/src/synfig/valuenodes/valuenode_vectorangle.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_vectorlength.cpp b/src/synfig/valuenodes/valuenode_vectorlength.cpp
similarity index 99%
rename from src/synfig/valuenode_vectorlength.cpp
rename to src/synfig/valuenodes/valuenode_vectorlength.cpp
index 7f08a1c..7f33ce1 100644
--- a/src/synfig/valuenode_vectorlength.cpp
+++ b/src/synfig/valuenodes/valuenode_vectorlength.cpp
@@ -33,7 +33,7 @@
 
 #include "valuenode_vectorlength.h"
 #include "valuenode_const.h"
-#include "general.h"
+#include <synfig/general.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_vectorlength.h b/src/synfig/valuenodes/valuenode_vectorlength.h
similarity index 98%
rename from src/synfig/valuenode_vectorlength.h
rename to src/synfig/valuenodes/valuenode_vectorlength.h
index 3c59390..9abfcd2 100644
--- a/src/synfig/valuenode_vectorlength.h
+++ b/src/synfig/valuenodes/valuenode_vectorlength.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_vectorx.cpp b/src/synfig/valuenodes/valuenode_vectorx.cpp
similarity index 99%
rename from src/synfig/valuenode_vectorx.cpp
rename to src/synfig/valuenodes/valuenode_vectorx.cpp
index 63f74bb..faa92ae 100644
--- a/src/synfig/valuenode_vectorx.cpp
+++ b/src/synfig/valuenodes/valuenode_vectorx.cpp
@@ -33,7 +33,7 @@
 
 #include "valuenode_vectorx.h"
 #include "valuenode_const.h"
-#include "general.h"
+#include <synfig/general.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_vectorx.h b/src/synfig/valuenodes/valuenode_vectorx.h
similarity index 98%
rename from src/synfig/valuenode_vectorx.h
rename to src/synfig/valuenodes/valuenode_vectorx.h
index 66f817c..491ba8f 100644
--- a/src/synfig/valuenode_vectorx.h
+++ b/src/synfig/valuenodes/valuenode_vectorx.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_vectory.cpp b/src/synfig/valuenodes/valuenode_vectory.cpp
similarity index 99%
rename from src/synfig/valuenode_vectory.cpp
rename to src/synfig/valuenodes/valuenode_vectory.cpp
index 74276ec..97d18ed 100644
--- a/src/synfig/valuenode_vectory.cpp
+++ b/src/synfig/valuenodes/valuenode_vectory.cpp
@@ -33,7 +33,7 @@
 
 #include "valuenode_vectory.h"
 #include "valuenode_const.h"
-#include "general.h"
+#include <synfig/general.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_vectory.h b/src/synfig/valuenodes/valuenode_vectory.h
similarity index 98%
rename from src/synfig/valuenode_vectory.h
rename to src/synfig/valuenodes/valuenode_vectory.h
index 2f67efb..e1260eb 100644
--- a/src/synfig/valuenode_vectory.h
+++ b/src/synfig/valuenodes/valuenode_vectory.h
@@ -29,7 +29,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include "valuenode.h"
+#include <synfig/valuenode.h>
 
 /* === M A C R O S ========================================================= */
 
diff --git a/src/synfig/valuenode_weightedaverage.cpp b/src/synfig/valuenodes/valuenode_weightedaverage.cpp
similarity index 97%
rename from src/synfig/valuenode_weightedaverage.cpp
rename to src/synfig/valuenodes/valuenode_weightedaverage.cpp
index 54bb1e6..8a44656 100644
--- a/src/synfig/valuenode_weightedaverage.cpp
+++ b/src/synfig/valuenodes/valuenode_weightedaverage.cpp
@@ -31,9 +31,9 @@
 
 #include "valuenode_weightedaverage.h"
 #include "valuenode_const.h"
-#include "valueoperations.h"
-#include "canvas.h"
-#include "weightedvalue.h"
+#include <synfig/valueoperations.h>
+#include <synfig/canvas.h>
+#include <synfig/weightedvalue.h>
 
 #endif
 
diff --git a/src/synfig/valuenode_weightedaverage.h b/src/synfig/valuenodes/valuenode_weightedaverage.h
similarity index 100%
rename from src/synfig/valuenode_weightedaverage.h
rename to src/synfig/valuenodes/valuenode_weightedaverage.h
diff --git a/src/synfig/valuenode_wplist.cpp b/src/synfig/valuenodes/valuenode_wplist.cpp
similarity index 99%
rename from src/synfig/valuenode_wplist.cpp
rename to src/synfig/valuenodes/valuenode_wplist.cpp
index 0738eef..57afb36 100644
--- a/src/synfig/valuenode_wplist.cpp
+++ b/src/synfig/valuenodes/valuenode_wplist.cpp
@@ -34,9 +34,9 @@
 #include "valuenode_const.h"
 #include "valuenode_composite.h"
 #include "valuenode_bline.h"
-#include "general.h"
-#include "exception.h"
-#include "widthpoint.h"
+#include <synfig/general.h>
+#include <synfig/exception.h>
+#include <synfig/widthpoint.h>
 #include <vector>
 #include <list>
 
diff --git a/src/synfig/valuenode_wplist.h b/src/synfig/valuenodes/valuenode_wplist.h
similarity index 97%
rename from src/synfig/valuenode_wplist.h
rename to src/synfig/valuenodes/valuenode_wplist.h
index 9c2a034..ff0274c 100644
--- a/src/synfig/valuenode_wplist.h
+++ b/src/synfig/valuenodes/valuenode_wplist.h
@@ -32,10 +32,10 @@
 #include <vector>
 #include <list>
 
-#include "valuenode.h"
-#include "time.h"
-#include "uniqueid.h"
-#include "widthpoint.h"
+#include <synfig/valuenode.h>
+#include <synfig/time.h>
+#include <synfig/uniqueid.h>
+#include <synfig/widthpoint.h>
 #include "valuenode_dynamiclist.h"
 
 /* === M A C R O S ========================================================= */
diff --git a/src/synfig/version.h b/src/synfig/version.h
index f7bd2df..a9d4a0f 100644
--- a/src/synfig/version.h
+++ b/src/synfig/version.h
@@ -40,14 +40,14 @@
 **	revision release.
 */
 #ifndef SYNFIG_VERSION
-#define SYNFIG_VERSION (010000)
+#define SYNFIG_VERSION (010002)
 #endif
 
 /*!	Increment this value whenever
 **	the library changes in a way
 **	that breaks library compatibility
 */
-#define SYNFIG_LIBRARY_VERSION	48
+#define SYNFIG_LIBRARY_VERSION	49
 
 /*! \writeme */
 #define SYNFIG_CHECK_VERSION()	synfig::check_version_(SYNFIG_LIBRARY_VERSION,sizeof(synfig::Vector),sizeof(synfig::Color),sizeof(synfig::Canvas),sizeof(synfig::Layer))
diff --git a/src/synfig/waypoint.cpp b/src/synfig/waypoint.cpp
index 519cc5f..21920d5 100644
--- a/src/synfig/waypoint.cpp
+++ b/src/synfig/waypoint.cpp
@@ -1,3 +1,4 @@
+
 /* === S Y N F I G ========================================================= */
 /*!	\file waypoint.cpp
 **	\brief Template File
@@ -30,8 +31,8 @@
 #endif
 
 #include "waypoint.h"
-#include "valuenode_const.h"
-#include "valuenode_animated.h"
+#include "valuenodes/valuenode_const.h"
+#include "valuenodes/valuenode_animated.h"
 
 #endif
 
diff --git a/src/synfig/zstreambuf.cpp b/src/synfig/zstreambuf.cpp
index 7ec882d..cb67392 100644
--- a/src/synfig/zstreambuf.cpp
+++ b/src/synfig/zstreambuf.cpp
@@ -1,175 +1,175 @@
-/* === S Y N F I G ========================================================= */
-/*!	\file zstreambuf.cpp
-**	\brief zstreambuf
-**
-**	$Id$
-**
-**	\legal
-**	......... ... 2013 Ivan Mahonin
-**
-**	This package is free software; you can redistribute it and/or
-**	modify it under the terms of the GNU General Public License as
-**	published by the Free Software Foundation; either version 2 of
-**	the License, or (at your option) any later version.
-**
-**	This package is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-**	General Public License for more details.
-**	\endlegal
-*/
-/* ========================================================================= */
-
-/* === H E A D E R S ======================================================= */
-
-#ifdef USING_PCH
-#	include "pch.h"
-#else
-#ifdef HAVE_CONFIG_H
-#	include <config.h>
-#endif
-
-#include <cstring>
-#include "zstreambuf.h"
-
-#endif
-
-/* === U S I N G =========================================================== */
-
-using namespace std;
-using namespace etl;
-using namespace synfig;
-
-/* === M A C R O S ========================================================= */
-
-/* === G L O B A L S ======================================================= */
-
-/* === P R O C E D U R E S ================================================= */
-
-/* === M E T H O D S ======================================================= */
-
-zstreambuf::zstreambuf(std::streambuf *buf):
-	buf_(buf),
-	inflate_initialized(false),
-	deflate_initialized(false)
-{
-}
-
-zstreambuf::~zstreambuf()
-{
-	sync();
-	if (inflate_initialized) inflateEnd(&inflate_stream_);
-	if (deflate_initialized) deflateEnd(&deflate_stream_);
-}
-
-bool zstreambuf::inflate_buf()
-{
-    // initialize inflate if need
-    if (!inflate_initialized)
-    {
-    	memset(&inflate_stream_, 0, sizeof(inflate_stream_));
-    	if (Z_OK != inflateInit2(&inflate_stream_, option_window_bits)) return false;
-    	inflate_initialized = true;
-    }
-
-    // read and inflate new chunk of data
-    char in_buf[option_bufsize];
-    inflate_stream_.avail_in = buf_->sgetn(in_buf, sizeof(in_buf));
-    inflate_stream_.next_in = (Bytef*)in_buf;
-	read_buffer_.resize(0);
-	do
-	{
-		inflate_stream_.avail_out = option_bufsize;
-		read_buffer_.resize(read_buffer_.size() + inflate_stream_.avail_out);
-		inflate_stream_.next_out = (Bytef*)(&read_buffer_.back() + 1 - inflate_stream_.avail_out);
-		int ret = ::inflate(&inflate_stream_, Z_NO_FLUSH);
-		read_buffer_.resize(read_buffer_.size() - inflate_stream_.avail_out);
-		if (ret != Z_OK) break;
-	} while (inflate_stream_.avail_out == 0);
-	assert(inflate_stream_.avail_in == 0);
-
-	// nothing to read
-	if (read_buffer_.empty()) return false;
-
-	// set new read buffer
-	char *pointer = &read_buffer_.front();
-    setg(pointer, pointer, pointer + read_buffer_.size());
-    return true;
-}
-
-bool zstreambuf::deflate_buf(bool flush)
-{
-	if (pbase() != NULL && pptr() > pbase())
-	{
-		// initialize deflate if need
-		if (!deflate_initialized)
-		{
-			memset(&deflate_stream_, 0, sizeof(deflate_stream_));
-
-			if (Z_OK != deflateInit2(&deflate_stream_,
-					option_compression_level,
-					option_method,
-					option_window_bits,
-					option_mem_level,
-					option_strategy
-			)) return false;
-
-			deflate_initialized = true;
-		}
-
-		// deflate and write new chunk of data
-		char out_buf[option_bufsize];
-		deflate_stream_.avail_in = (uInt)(pptr() - pbase());
-		deflate_stream_.next_in = (Bytef*)pbase();
-		do
-		{
-			deflate_stream_.avail_out = sizeof(out_buf);
-			deflate_stream_.next_out = (Bytef*)out_buf;
-			if (Z_STREAM_ERROR == deflate(&deflate_stream_, flush ? Z_FINISH : Z_NO_FLUSH))
-				return false;
-			if (deflate_stream_.avail_out < sizeof(out_buf))
-				buf_->sputn(out_buf, sizeof(out_buf) - deflate_stream_.avail_out);
-		} while (deflate_stream_.avail_out == 0);
-		assert(deflate_stream_.avail_in == 0);
-		setp(NULL, NULL);
-	}
-	return true;
-}
-
-int zstreambuf::sync()
-{
-	bool deflate_success = deflate_buf(true);
-	bool buf_sync_success = 0 == buf_->pubsync();
-	return deflate_success && buf_sync_success ? 0 : -1;
-}
-
-int zstreambuf::underflow()
-{
-	// is it actually underflow?
-    if (gptr() < egptr()) return traits_type::to_int_type(*gptr());
-    if (!inflate_buf()) return EOF;
-	return *(unsigned char *)gptr();
-}
-
-int zstreambuf::overflow(int c)
-{
-	// flush
-	if (c == EOF) { sync(); return EOF; }
-
-	// save data and prepare new buffer
-	if (pptr() >= epptr())
-	{
-		if (!deflate_buf(false)) return EOF;
-		if (write_buffer_.size() < option_bufsize) write_buffer_.resize(option_bufsize);
-		char *pointer = &write_buffer_.front();
-		setp(pointer, pointer + write_buffer_.size());
-	}
-
-	// put character
-	*pptr() = traits_type::to_char_type(c);
-	pbump(1);
-	return c;
-}
-
-/* === E N T R Y P O I N T ================================================= */
-
+/* === S Y N F I G ========================================================= */
+/*!	\file zstreambuf.cpp
+**	\brief zstreambuf
+**
+**	$Id$
+**
+**	\legal
+**	......... ... 2013 Ivan Mahonin
+**
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
+**
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
+**	\endlegal
+*/
+/* ========================================================================= */
+
+/* === H E A D E R S ======================================================= */
+
+#ifdef USING_PCH
+#	include "pch.h"
+#else
+#ifdef HAVE_CONFIG_H
+#	include <config.h>
+#endif
+
+#include <cstring>
+#include "zstreambuf.h"
+
+#endif
+
+/* === U S I N G =========================================================== */
+
+using namespace std;
+using namespace etl;
+using namespace synfig;
+
+/* === M A C R O S ========================================================= */
+
+/* === G L O B A L S ======================================================= */
+
+/* === P R O C E D U R E S ================================================= */
+
+/* === M E T H O D S ======================================================= */
+
+zstreambuf::zstreambuf(std::streambuf *buf):
+	buf_(buf),
+	inflate_initialized(false),
+	deflate_initialized(false)
+{
+}
+
+zstreambuf::~zstreambuf()
+{
+	sync();
+	if (inflate_initialized) inflateEnd(&inflate_stream_);
+	if (deflate_initialized) deflateEnd(&deflate_stream_);
+}
+
+bool zstreambuf::inflate_buf()
+{
+    // initialize inflate if need
+    if (!inflate_initialized)
+    {
+    	memset(&inflate_stream_, 0, sizeof(inflate_stream_));
+    	if (Z_OK != inflateInit2(&inflate_stream_, option_window_bits)) return false;
+    	inflate_initialized = true;
+    }
+
+    // read and inflate new chunk of data
+    char in_buf[option_bufsize];
+    inflate_stream_.avail_in = buf_->sgetn(in_buf, sizeof(in_buf));
+    inflate_stream_.next_in = (Bytef*)in_buf;
+	read_buffer_.resize(0);
+	do
+	{
+		inflate_stream_.avail_out = option_bufsize;
+		read_buffer_.resize(read_buffer_.size() + inflate_stream_.avail_out);
+		inflate_stream_.next_out = (Bytef*)(&read_buffer_.back() + 1 - inflate_stream_.avail_out);
+		int ret = ::inflate(&inflate_stream_, Z_NO_FLUSH);
+		read_buffer_.resize(read_buffer_.size() - inflate_stream_.avail_out);
+		if (ret != Z_OK) break;
+	} while (inflate_stream_.avail_out == 0);
+	assert(inflate_stream_.avail_in == 0);
+
+	// nothing to read
+	if (read_buffer_.empty()) return false;
+
+	// set new read buffer
+	char *pointer = &read_buffer_.front();
+    setg(pointer, pointer, pointer + read_buffer_.size());
+    return true;
+}
+
+bool zstreambuf::deflate_buf(bool flush)
+{
+	if (pbase() != NULL && pptr() > pbase())
+	{
+		// initialize deflate if need
+		if (!deflate_initialized)
+		{
+			memset(&deflate_stream_, 0, sizeof(deflate_stream_));
+
+			if (Z_OK != deflateInit2(&deflate_stream_,
+					option_compression_level,
+					option_method,
+					option_window_bits,
+					option_mem_level,
+					option_strategy
+			)) return false;
+
+			deflate_initialized = true;
+		}
+
+		// deflate and write new chunk of data
+		char out_buf[option_bufsize];
+		deflate_stream_.avail_in = (uInt)(pptr() - pbase());
+		deflate_stream_.next_in = (Bytef*)pbase();
+		do
+		{
+			deflate_stream_.avail_out = sizeof(out_buf);
+			deflate_stream_.next_out = (Bytef*)out_buf;
+			if (Z_STREAM_ERROR == deflate(&deflate_stream_, flush ? Z_FINISH : Z_NO_FLUSH))
+				return false;
+			if (deflate_stream_.avail_out < sizeof(out_buf))
+				buf_->sputn(out_buf, sizeof(out_buf) - deflate_stream_.avail_out);
+		} while (deflate_stream_.avail_out == 0);
+		assert(deflate_stream_.avail_in == 0);
+		setp(NULL, NULL);
+	}
+	return true;
+}
+
+int zstreambuf::sync()
+{
+	bool deflate_success = deflate_buf(true);
+	bool buf_sync_success = 0 == buf_->pubsync();
+	return deflate_success && buf_sync_success ? 0 : -1;
+}
+
+int zstreambuf::underflow()
+{
+	// is it actually underflow?
+    if (gptr() < egptr()) return traits_type::to_int_type(*gptr());
+    if (!inflate_buf()) return EOF;
+	return *(unsigned char *)gptr();
+}
+
+int zstreambuf::overflow(int c)
+{
+	// flush
+	if (c == EOF) { sync(); return EOF; }
+
+	// save data and prepare new buffer
+	if (pptr() >= epptr())
+	{
+		if (!deflate_buf(false)) return EOF;
+		if (write_buffer_.size() < option_bufsize) write_buffer_.resize(option_bufsize);
+		char *pointer = &write_buffer_.front();
+		setp(pointer, pointer + write_buffer_.size());
+	}
+
+	// put character
+	*pptr() = traits_type::to_char_type(c);
+	pbump(1);
+	return c;
+}
+
+/* === E N T R Y P O I N T ================================================= */
+
diff --git a/src/synfig/zstreambuf.h b/src/synfig/zstreambuf.h
index 90b8354..05ee3d1 100644
--- a/src/synfig/zstreambuf.h
+++ b/src/synfig/zstreambuf.h
@@ -1,130 +1,130 @@
-/* === S Y N F I G ========================================================= */
-/*!	\file zstreambuf.h
-**	\brief zstreambuf
-**
-**	$Id$
-**
-**	\legal
-**	......... ... 2013 Ivan Mahonin
-**
-**	This package is free software; you can redistribute it and/or
-**	modify it under the terms of the GNU General Public License as
-**	published by the Free Software Foundation; either version 2 of
-**	the License, or (at your option) any later version.
-**
-**	This package is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-**	General Public License for more details.
-**	\endlegal
-*/
-/* ========================================================================= */
-
-/* === S T A R T =========================================================== */
-
-#ifndef __SYNFIG_ZSTREAMBUF_H
-#define __SYNFIG_ZSTREAMBUF_H
-
-/* === H E A D E R S ======================================================= */
-
-#include <streambuf>
-#include <istream>
-#include <ostream>
-#include <vector>
-#include <zlib.h>
-#include "filesystem.h"
-
-/* === M A C R O S ========================================================= */
-
-/* === T Y P E D E F S ===================================================== */
-
-/* === C L A S S E S & S T R U C T S ======================================= */
-
-namespace synfig {
-
-	class zstreambuf : public std::streambuf
-	{
-	public:
-		enum {
-			option_bufsize				= 4096,
-			option_method				= Z_DEFLATED,
-			option_compression_level	= 9,
-			option_window_bits			= 16+MAX_WBITS,
-			option_mem_level			= 9,
-			option_strategy				= Z_DEFAULT_STRATEGY
-		};
-
-	private:
-		std::streambuf *buf_;
-
-		bool inflate_initialized;
-		z_stream inflate_stream_;
-		std::vector<char> read_buffer_;
-
-		bool deflate_initialized;
-		z_stream deflate_stream_;
-		std::vector<char> write_buffer_;
-
-		bool inflate_buf();
-		bool deflate_buf(bool flush);
-
-	public:
-		explicit zstreambuf(std::streambuf *buf);
-		virtual ~zstreambuf();
-
-	protected:
-		virtual int sync();
-		virtual int underflow();
-		virtual int overflow(int c = EOF);
-	};
-
-	class ZReadStream : public FileSystem::ReadStream
-	{
-	private:
-		FileSystem::ReadStreamHandle stream_;
-		zstreambuf buf_;
-		std::istream istream_;
-
-	protected:
-		virtual size_t internal_read(void *buffer, size_t size)
-			{ return (size_t)istream_.read((char*)buffer, size).gcount(); }
-
-	public:
-		ZReadStream(FileSystem::ReadStreamHandle stream):
-			FileSystem::ReadStream(stream->file_system()),
-			stream_(stream),
-			buf_(stream_->rdbuf()),
-			istream_(&buf_)
-		{ }
-
-	};
-
-	class ZWriteStream : public FileSystem::WriteStream
-	{
-	private:
-		FileSystem::WriteStreamHandle stream_;
-		zstreambuf buf_;
-		std::ostream ostream_;
-
-	protected:
-		virtual size_t internal_write(const void *buffer, size_t size)
-		{
-			for(size_t i = 0; i < size; i++)
-				if (!ostream_.put(((const char*)buffer)[i]).good())
-					return i;
-			return size;
-		}
-
-	public:
-		ZWriteStream(FileSystem::WriteStreamHandle stream):
-			FileSystem::WriteStream(stream->file_system()),
-			stream_(stream),
-			buf_(stream_->rdbuf()),
-			ostream_(&buf_)
-		{ }
-	};
-}
-
-/* === E N D =============================================================== */
-
-#endif
+/* === S Y N F I G ========================================================= */
+/*!	\file zstreambuf.h
+**	\brief zstreambuf
+**
+**	$Id$
+**
+**	\legal
+**	......... ... 2013 Ivan Mahonin
+**
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
+**
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
+**	\endlegal
+*/
+/* ========================================================================= */
+
+/* === S T A R T =========================================================== */
+
+#ifndef __SYNFIG_ZSTREAMBUF_H
+#define __SYNFIG_ZSTREAMBUF_H
+
+/* === H E A D E R S ======================================================= */
+
+#include <streambuf>
+#include <istream>
+#include <ostream>
+#include <vector>
+#include <zlib.h>
+#include "filesystem.h"
+
+/* === M A C R O S ========================================================= */
+
+/* === T Y P E D E F S ===================================================== */
+
+/* === C L A S S E S & S T R U C T S ======================================= */
+
+namespace synfig {
+
+	class zstreambuf : public std::streambuf
+	{
+	public:
+		enum {
+			option_bufsize				= 4096,
+			option_method				= Z_DEFLATED,
+			option_compression_level	= 9,
+			option_window_bits			= 16+MAX_WBITS,
+			option_mem_level			= 9,
+			option_strategy				= Z_DEFAULT_STRATEGY
+		};
+
+	private:
+		std::streambuf *buf_;
+
+		bool inflate_initialized;
+		z_stream inflate_stream_;
+		std::vector<char> read_buffer_;
+
+		bool deflate_initialized;
+		z_stream deflate_stream_;
+		std::vector<char> write_buffer_;
+
+		bool inflate_buf();
+		bool deflate_buf(bool flush);
+
+	public:
+		explicit zstreambuf(std::streambuf *buf);
+		virtual ~zstreambuf();
+
+	protected:
+		virtual int sync();
+		virtual int underflow();
+		virtual int overflow(int c = EOF);
+	};
+
+	class ZReadStream : public FileSystem::ReadStream
+	{
+	private:
+		FileSystem::ReadStreamHandle stream_;
+		zstreambuf buf_;
+		std::istream istream_;
+
+	protected:
+		virtual size_t internal_read(void *buffer, size_t size)
+			{ return (size_t)istream_.read((char*)buffer, size).gcount(); }
+
+	public:
+		ZReadStream(FileSystem::ReadStreamHandle stream):
+			FileSystem::ReadStream(stream->file_system()),
+			stream_(stream),
+			buf_(stream_->rdbuf()),
+			istream_(&buf_)
+		{ }
+
+	};
+
+	class ZWriteStream : public FileSystem::WriteStream
+	{
+	private:
+		FileSystem::WriteStreamHandle stream_;
+		zstreambuf buf_;
+		std::ostream ostream_;
+
+	protected:
+		virtual size_t internal_write(const void *buffer, size_t size)
+		{
+			for(size_t i = 0; i < size; i++)
+				if (!ostream_.put(((const char*)buffer)[i]).good())
+					return i;
+			return size;
+		}
+
+	public:
+		ZWriteStream(FileSystem::WriteStreamHandle stream):
+			FileSystem::WriteStream(stream->file_system()),
+			stream_(stream),
+			buf_(stream_->rdbuf()),
+			ostream_(&buf_)
+		{ }
+	};
+}
+
+/* === E N D =============================================================== */
+
+#endif
diff --git a/src/tool/Makefile.in b/src/tool/Makefile.in
index 3659350..e54ce71 100644
--- a/src/tool/Makefile.in
+++ b/src/tool/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
 # $Id$
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -82,8 +92,6 @@ build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = synfig$(EXEEXT)
 subdir = src/tool
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -102,6 +110,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 =
@@ -200,6 +209,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -464,7 +474,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/tool/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/tool/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -550,22 +559,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/synfig-renderprogress.Po at am__quote@
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
@@ -866,6 +878,8 @@ uninstall-am: uninstall-binPROGRAMS
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
 
+.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.
diff --git a/test/Makefile.in b/test/Makefile.in
index ae4fec4..73764be 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -16,7 +16,17 @@
 
 # $Id$
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
       ?) ;; \
@@ -82,8 +92,6 @@ host_triplet = @host@
 check_PROGRAMS = $(am__EXEEXT_1)
 TESTS = bone$(EXEEXT)
 subdir = test
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/depcomp $(top_srcdir)/config/test-driver
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -102,6 +110,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/argz.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 =
@@ -378,6 +387,8 @@ TEST_LOGS = $(am__test_logs2:.test.log=.log)
 TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver
 TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
 	$(TEST_LOG_FLAGS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp \
+	$(top_srcdir)/config/test-driver
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -604,7 +615,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu test/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -645,22 +655,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/bone.Po at am__quote@
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.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 at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
@@ -753,7 +766,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
 	if test -n "$$am__remaking_logs"; then \
 	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
 	       "recursion detected" >&2; \
-	else \
+	elif test -n "$$redo_logs"; then \
 	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
 	fi; \
 	if $(am__make_dryrun); then :; else \
@@ -1043,6 +1056,8 @@ uninstall-am:
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	recheck 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.

-- 
synfig-synfig packaging



More information about the pkg-multimedia-commits mailing list