11 files changed, 614 insertions, 173 deletions

diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile
index 60948b65f1d4..c16e0d1ba4b7 100644
--- a/graphics/rawtherapee/Makefile
+++ b/graphics/rawtherapee/Makefile
@@ -1,15 +1,14 @@
 # New ports collection makefile for:	rawtherapee
-# Date created:		01/10/2010
-# Whom:			stas
+# Date created:				01/10/2010
+# Whom:					stas
 #
 # $FreeBSD$
 #
 
 PORTNAME=	rawtherapee
-PORTVERSION=	4.0.2
-PORTREVISION=	0
+PORTVERSION=	4.0.7
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.SpringDaemons.com/soft/
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A powerful RAW image processing application
@@ -25,7 +24,7 @@ LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
 		sigc-2.0:${PORTSDIR}/devel/libsigc++20
 
 USE_CMAKE=	yes
-USE_BZIP2=	yes
+USE_XZ=		yes
 USE_GNOME=	gtk20 glib20 pkgconfig
 USE_LDCONFIG=	yes
 CFLAGS+=	-I${LOCALBASE}/include -fPIC ${PTHREAD_CFLAGS}
@@ -44,7 +43,7 @@ SUB_FILES=	rawtherapee
 SUB_LIST=	RTDIR="${RTDIR}"
 INSTALLS_ICONS=	yes
 
-RTDIR=	${PREFIX}/libdata/${PORTNAME}
+RTDIR=		${PREFIX}/libdata/${PORTNAME}
 
 OPTIONS=	OPTIMIZED_CFLAGS "Use optimized CFLAGS" on \
 		OPENMP "Enable multicore processing using OpenMP" on
@@ -60,8 +59,8 @@ CXXFLAGS+=	-O3 -ffast-math -fexpensive-optimizations \
 .endif
 .endif
 
-.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" || ${ARCH} == "i386"
-BROKEN=		Does not compile on i386, ia64, powerpc, or sparc64
+.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
+BROKEN=		Does not compile on ia64, powerpc, or sparc64
 .endif
 
 .if !defined(WITHOUT_OPENMP)
diff --git a/graphics/rawtherapee/distinfo b/graphics/rawtherapee/distinfo
index a538be60ea4b..1ce9237270a1 100644
--- a/graphics/rawtherapee/distinfo
+++ b/graphics/rawtherapee/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rawtherapee-4.0.2.tar.bz2) = 9a7af9a78dd6e84d0a236c6b92447d8844972318b203983743ba487533250e1a
-SIZE (rawtherapee-4.0.2.tar.bz2) = 29029897
+SHA256 (rawtherapee-4.0.7.tar.xz) = 53ee32679389b52392ff03284ebc76f89e3476ec1fc30a8405817f8a2a0659c8
+SIZE (rawtherapee-4.0.7.tar.xz) = 34647976
diff --git a/graphics/rawtherapee/files/patch-About-Linux.cmake b/graphics/rawtherapee/files/patch-About-Linux.cmake
index 5c0e53e1df59..06b90d8ba3a0 100644
--- a/graphics/rawtherapee/files/patch-About-Linux.cmake
+++ b/graphics/rawtherapee/files/patch-About-Linux.cmake
@@ -1,5 +1,5 @@
---- About-Linux.cmake.orig	2011-09-07 23:50:07.000000000 -0700
-+++ About-Linux.cmake	2011-09-07 23:51:21.000000000 -0700
+--- ./About-Linux.cmake.orig	2012-01-31 05:00:05.000000000 +0400
++++ ./About-Linux.cmake	2012-03-29 19:28:04.000000000 +0400
 @@ -1,27 +1,8 @@
  # cmakefile executed within a makefile target
  
diff --git a/graphics/rawtherapee/files/patch-CMakeLists.txt b/graphics/rawtherapee/files/patch-CMakeLists.txt
index ae25127fe8b7..89a835f3e29b 100644
--- a/graphics/rawtherapee/files/patch-CMakeLists.txt
+++ b/graphics/rawtherapee/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2011-09-06 23:56:26.000000000 -0700
-+++ CMakeLists.txt	2011-09-07 01:05:07.000000000 -0700
-@@ -224,7 +224,6 @@
+--- ./CMakeLists.txt.orig	2012-01-31 05:00:05.000000000 +0400
++++ ./CMakeLists.txt	2012-03-29 19:28:04.000000000 +0400
+@@ -230,7 +230,6 @@
                -P ${CMAKE_CURRENT_SOURCE_DIR}/About-Windows.cmake
        COMMENT "Creating the about file"
      )
@@ -8,7 +8,7 @@
  
    elseif (APPLE)
   
-@@ -244,7 +243,6 @@
+@@ -250,7 +249,6 @@
                -P ${CMAKE_CURRENT_SOURCE_DIR}/About-Apple.cmake
        COMMENT "Creating the about file"
      )
@@ -16,7 +16,7 @@
      find_file(HG_CMD hg)
  
    else (WIN32)
-@@ -265,18 +263,11 @@
+@@ -271,18 +269,11 @@
                -P ${CMAKE_CURRENT_SOURCE_DIR}/About-Linux.cmake
        COMMENT "Creating the about file"
      )
diff --git a/graphics/rawtherapee/files/patch-rtengine-CA__correct__RT.c b/graphics/rawtherapee/files/patch-rtengine-CA__correct__RT.c
new file mode 100644
index 000000000000..233d7c378383
--- /dev/null
+++ b/graphics/rawtherapee/files/patch-rtengine-CA__correct__RT.c
@@ -0,0 +1,20 @@
+--- ./rtengine/CA_correct_RT.cc.orig	2012-01-31 05:00:05.000000000 +0400
++++ ./rtengine/CA_correct_RT.cc	2012-03-30 13:23:58.000000000 +0400
+@@ -467,7 +467,7 @@
+ 					gdiff=0.3125*(rgb[indx+TS][1]-rgb[indx-TS][1])+0.09375*(rgb[indx+TS+1][1]-rgb[indx-TS+1][1]+rgb[indx+TS-1][1]-rgb[indx-TS-1][1]);
+ 					deltgrb=(rgb[indx][c]-rgb[indx][1])-0.5*((rgb[indx-v4][c]-rgb[indx-v4][1])+(rgb[indx+v4][c]-rgb[indx+v4][1]));
+ 					
+-					gradwt=fabs(0.25*rbhpfv[indx]+0.125*(rbhpfv[indx+2]+rbhpfv[indx-2]) );//*(grblpfv[indx-v2]+grblpfv[indx+v2])/(eps+0.1*grblpfv[indx-v2]+rblpfv[indx-v2]+0.1*grblpfv[indx+v2]+rblpfv[indx+v2]);
++					gradwt=fabs(0.25*rbhpfv[indx]+0.125*(rbhpfv[indx+2]+rbhpfv[indx-2]) );// *(grblpfv[indx-v2]+grblpfv[indx+v2])/(eps+0.1*grblpfv[indx-v2]+rblpfv[indx-v2]+0.1*grblpfv[indx+v2]+rblpfv[indx+v2]);
+ 					if (gradwt>eps) {
+ 					coeff[0][0][c] += gradwt*deltgrb*deltgrb;
+ 					coeff[0][1][c] += gradwt*gdiff*deltgrb;
+@@ -479,7 +479,7 @@
+ 					gdiff=0.3125*(rgb[indx+1][1]-rgb[indx-1][1])+0.09375*(rgb[indx+1+TS][1]-rgb[indx-1+TS][1]+rgb[indx+1-TS][1]-rgb[indx-1-TS][1]);
+ 					deltgrb=(rgb[indx][c]-rgb[indx][1])-0.5*((rgb[indx-4][c]-rgb[indx-4][1])+(rgb[indx+4][c]-rgb[indx+4][1]));
+ 					
+-					gradwt=fabs(0.25*rbhpfh[indx]+0.125*(rbhpfh[indx+v2]+rbhpfh[indx-v2]) );//*(grblpfh[indx-2]+grblpfh[indx+2])/(eps+0.1*grblpfh[indx-2]+rblpfh[indx-2]+0.1*grblpfh[indx+2]+rblpfh[indx+2]);
++					gradwt=fabs(0.25*rbhpfh[indx]+0.125*(rbhpfh[indx+v2]+rbhpfh[indx-v2]) );// *(grblpfh[indx-2]+grblpfh[indx+2])/(eps+0.1*grblpfh[indx-2]+rblpfh[indx-2]+0.1*grblpfh[indx+2]+rblpfh[indx+2]);
+ 					if (gradwt>eps) {
+ 					coeff[1][0][c] += gradwt*deltgrb*deltgrb;
+ 					coeff[1][1][c] += gradwt*gdiff*deltgrb;
diff --git a/graphics/rawtherapee/files/patch-rtengine_array2D.h b/graphics/rawtherapee/files/patch-rtengine_array2D.h
new file mode 100644
index 000000000000..e5d4a1ecbbb6
--- /dev/null
+++ b/graphics/rawtherapee/files/patch-rtengine_array2D.h
@@ -0,0 +1,33 @@
+--- ./rtengine/array2D.h.orig	2012-01-31 05:00:05.000000000 +0400
++++ ./rtengine/array2D.h	2012-03-30 13:26:24.000000000 +0400
+@@ -156,7 +156,7 @@
+ 	}
+ 
+ 	// use with indices
+-	T * operator[](size_t index) {
++	T * operator[](int index) {
+         assert(index<y); 
+ 		return ptr[index];
+ 	}
+@@ -252,7 +252,7 @@
+ 
+ public:
+ 	multi_array2D(int x, int y, int flags = 0) {
+-		for (int i = 0; i < num; i++)
++		for (size_t i = 0; i < num; i++)
+ 			list[i](x, y, flags);
+ 	}
+ 
+@@ -260,9 +260,9 @@
+ 		//printf("trying to delete the list of array2D objects\n");
+ 	}
+ 
+-	array2D<T> & operator[](size_t index) {
+-		if (index >= num) {
+-			printf("index %zu is out of range[0..%zu]", index, num - 1);
++	array2D<T> & operator[](int index) {
++		if (static_cast<size_t>(index) >= num) {
++			printf("index %0u is out of range[0..%0u]", index, num - 1);
+ 			raise( SIGSEGV);
+ 		}
+ 		return list[index];
diff --git a/graphics/rawtherapee/files/patch-rtengine_improcfun.h b/graphics/rawtherapee/files/patch-rtengine_improcfun.h
new file mode 100644
index 000000000000..43a76028d159
--- /dev/null
+++ b/graphics/rawtherapee/files/patch-rtengine_improcfun.h
@@ -0,0 +1,12 @@
+--- ./rtengine/improcfun.h.orig	2012-01-31 05:00:05.000000000 +0400
++++ ./rtengine/improcfun.h	2012-03-30 23:15:22.000000000 +0400
+@@ -18,6 +18,9 @@
+  */
+ #ifndef _IMPROCFUN_H_
+ #define _IMPROCFUN_H_
++#ifndef log2(x)
++#define log2(x) (log(x)/log(2))
++#endif
+ 
+ #include "imagefloat.h"
+ #include "image16.h"
diff --git a/graphics/rawtherapee/files/patch-rtengine_myfile.h b/graphics/rawtherapee/files/patch-rtengine_myfile.h
index 68dd5166033f..8bca1d7a3152 100644
--- a/graphics/rawtherapee/files/patch-rtengine_myfile.h
+++ b/graphics/rawtherapee/files/patch-rtengine_myfile.h
@@ -1,9 +1,9 @@
---- rtengine/myfile.h.orig	2011-07-30 14:05:38.000000000 -0700
-+++ rtengine/myfile.h	2011-07-31 19:27:22.000000000 -0700
+--- ./rtengine/myfile.h.orig	2012-01-31 05:00:05.000000000 +0400
++++ ./rtengine/myfile.h	2012-03-29 19:28:04.000000000 +0400
 @@ -22,6 +22,8 @@
  #include <glib/gstdio.h>
- #include <stdio.h>
- #include <string.h>
+ #include <cstdio>
+ #include <cstring>
 +#undef feof
 +#undef getc
  struct IMFILE {
diff --git a/graphics/rawtherapee/files/patch-rtengine_safegtk.cc b/graphics/rawtherapee/files/patch-rtengine_safegtk.cc
index 3c9dcc42afe2..b46fa7c51581 100644
--- a/graphics/rawtherapee/files/patch-rtengine_safegtk.cc
+++ b/graphics/rawtherapee/files/patch-rtengine_safegtk.cc
@@ -1,47 +1,47 @@
---- rtengine/safegtk.cc.orig	2011-09-07 14:24:33.000000000 -0700
-+++ rtengine/safegtk.cc	2011-09-07 14:25:11.000000000 -0700
-@@ -101,7 +101,7 @@
-     Glib::RefPtr<Gio::FileEnumerator> dirList;

-     if (dir) {

- 				SAFE_ENUMERATOR_CODE_START

--						flist.push_back (FileMTimeInfo (removeExtension(info->get_name()), info->modification_time()));

-+						flist.push_back (FileMTimeInfo (removeExtension(info->get_display_name()), info->modification_time()));

- 				SAFE_ENUMERATOR_CODE_END;

-     }

+--- ./rtengine/safegtk.cc.orig	2012-01-31 05:00:05.000000000 +0400
++++ ./rtengine/safegtk.cc	2012-03-29 19:31:25.000000000 +0400
+@@ -98,7 +98,7 @@
+ 	Glib::RefPtr<Gio::FileEnumerator> dirList;

+ 	if (dir) {

+ 		SAFE_ENUMERATOR_CODE_START

+-				flist.push_back (FileMTimeInfo (removeExtension(info->get_name()), info->modification_time()));

++				flist.push_back (FileMTimeInfo (removeExtension(info->get_display_name()), info->modification_time()));
+ 		SAFE_ENUMERATOR_CODE_END;

+ 	}

  }

-@@ -116,7 +116,7 @@
-     if (dir) {

-     	if (!extensions) {

+@@ -113,7 +113,7 @@
+ 	if (dir) {

+ 		if (!extensions) {

  			SAFE_ENUMERATOR_CODE_START

 -				names.push_back (Glib::build_filename (directory, info->get_name()));

-+				names.push_back (Glib::build_filename (directory, info->get_display_name()));

++				names.push_back (Glib::build_filename (directory, info->get_display_name()));
  			SAFE_ENUMERATOR_CODE_END;

-     	}

-     	else {

-@@ -127,7 +127,7 @@
+ 		}

+ 		else {

+@@ -124,7 +124,7 @@
  

  			SAFE_ENUMERATOR_CODE_START

  			// convert the current filename to lowercase in a new ustring

 -			Glib::ustring fname = Glib::ustring(info->get_name()).lowercase();

-+			Glib::ustring fname = Glib::ustring(info->get_display_name()).lowercase();

++			Glib::ustring fname = Glib::ustring(info->get_display_name()).lowercase();
  

  			int pos = fname.find_last_of('.');

  			if (pos > -1 && pos < (fname.length()-1)) {

-@@ -138,7 +138,7 @@
+@@ -135,7 +135,7 @@
  				// look out if it has one of the retained extensions

  				for (unsigned int i=0; i<lcExtensions.size(); i++) {

  					if (lcFileExt == lcExtensions[i]) {

 -						names.push_back (Glib::build_filename (directory, info->get_name()));

-+						names.push_back (Glib::build_filename (directory, info->get_display_name()));

++						names.push_back (Glib::build_filename (directory, info->get_display_name()));
  						break;

  					}

  				}

-@@ -159,7 +159,7 @@
+@@ -156,7 +156,7 @@
  

  				SAFE_ENUMERATOR_CODE_START

  						if (info->get_file_type() == Gio::FILE_TYPE_DIRECTORY && (!info->is_hidden() || add_hidden))

 -								subDirs.push_back (info->get_name());

-+								subDirs.push_back (info->get_display_name());

++								subDirs.push_back (info->get_display_name());
  				SAFE_ENUMERATOR_CODE_END;

-     }

+ 	}

  }

diff --git a/graphics/rawtherapee/pkg-descr b/graphics/rawtherapee/pkg-descr
index a23bd9d234a8..98edc6cca06d 100644
--- a/graphics/rawtherapee/pkg-descr
+++ b/graphics/rawtherapee/pkg-descr
@@ -1,32 +1,32 @@
     RawTherapee is a powerful RAW image processing appliction.
-Main features :
+Main features:
  * Selectable high performance demosaicing algorithms
-   (EAHD and HPHD and VNG-4). 
- * Image post processing in 16 bit / channel mode 
- * Exposure control in RGB space 
+   (EAHD and HPHD and VNG-4).
+ * Image post processing in 16 bit / channel mode
+ * Exposure control in RGB space
  * Auto exposure with adjustable clipping point / Exposure compensation /
    Shadow and highight compression / Contrast adjustment, curve editor
- * White balance adjustment in RGB space 
+ * White balance adjustment in RGB space
  * With in-camera, automatic and spot white balance options /
    Temperature/Green tint fine tuning
  * Highlight Recovery
  * Shadows/Highlights control in RGB space
  * Basic Luminance curve tool to modify the luminance channel
-   in CIELab color space 
+   in CIELab color space
  * Brightness / Contrast adjustment, curve editor
- * USM sharpening applied on the CIELab luminance channel 
+ * USM sharpening applied on the CIELab luminance channel
  * Classical USM parameters (Radius, Amount, Threshold) / Option to avoid
    noise amplification / Sharpening halo control
  * Optional RL Deconvolution based sharpening for even better sharpening results
- * Color shift control in CIELab color space 
+ * Color shift control in CIELab color space
  * Allows color shift by shifting the CIELab "a" and "b" channels
- * Color booster applied on the CIELab "a" and "b" channels 
+ * Color booster applied on the CIELab "a" and "b" channels
  * Amplifies color channels "a" and "b" together or separately /
    Avoids color overamplification in high chrominance areas /
    Option to avoid clipping caused by too high color boosting
- * Luminance denoising algorithm applied on the CIELab luminance channel 
+ * Luminance denoising algorithm applied on the CIELab luminance channel
  * Edge sensitive method to preserve as much details as possible
- * Color denoising tool applied on the CIELab "a" and "b" channels 
+ * Color denoising tool applied on the CIELab "a" and "b" channels
  * Classical gaussian blur or edge sensitive bluring of the color channels
  * Fast switching between different postprocessing profiles
  * Image flipping horizontally or vertically, rotation by 90 degrees clockwise
@@ -42,4 +42,4 @@ Main features :
  * ICC based color management
  * Change History with bookmarks to support before/after checking
 
-WWW:	http://www.rawtherapee.com
+WWW:	http://www.rawtherapee.com/
diff --git a/graphics/rawtherapee/pkg-plist b/graphics/rawtherapee/pkg-plist
index eaf6e303c126..0313a70aa3a5 100644
--- a/graphics/rawtherapee/pkg-plist
+++ b/graphics/rawtherapee/pkg-plist
@@ -1,20 +1,404 @@
 bin/rawtherapee
+share/applications/rawtherapee.desktop
 %%DOCSDIR%%/AUTHORS.txt
-%%DOCSDIR%%/LICENSE.txt
 %%DOCSDIR%%/AboutThisBuild.txt
-share/applications/rawtherapee.desktop
+%%DOCSDIR%%/LICENSE.txt
+%%DOCSDIR%%/RELEASE_NOTES.txt
+share/icons/hicolor/128x128/apps/rawtherapee.png
 share/icons/hicolor/16x16/apps/rawtherapee.png
 share/icons/hicolor/24x24/apps/rawtherapee.png
+share/icons/hicolor/256x256/apps/rawtherapee.png
 share/icons/hicolor/32x32/apps/rawtherapee.png
 share/icons/hicolor/48x48/apps/rawtherapee.png
-share/icons/hicolor/128x128/apps/rawtherapee.png
-share/icons/hicolor/256x256/apps/rawtherapee.png
-%%DATADIR%%/images/FullScreen_exit.png
-%%DATADIR%%/images/PanelEnding_01.png
-%%DATADIR%%/images/addtagl.png
-%%DATADIR%%/images/addtags.png
+%%DATADIR%%/iccprofiles/input/Canon EOS 20D.icc
+%%DATADIR%%/iccprofiles/input/Canon EOS 450D.icc
+%%DATADIR%%/iccprofiles/input/Canon EOS 550D.icc
+%%DATADIR%%/iccprofiles/input/Canon EOS 5D.icc
+%%DATADIR%%/iccprofiles/input/Canon EOS Digital Rebel XSi.icc
+%%DATADIR%%/iccprofiles/input/Canon EOS Rebel T2i.icc
+%%DATADIR%%/iccprofiles/input/Canon EOS-1D Mark III.icc
+%%DATADIR%%/iccprofiles/input/Canon PowerShot G10.icc
+%%DATADIR%%/iccprofiles/input/Nikon D200.icc
+%%DATADIR%%/iccprofiles/input/Nikon D3100.icc
+%%DATADIR%%/iccprofiles/input/Nikon D3S.icc
+%%DATADIR%%/iccprofiles/input/Nikon D700.icc
+%%DATADIR%%/iccprofiles/input/Nikon D7000.icc
+%%DATADIR%%/iccprofiles/input/Olympus E-P2.icc
+%%DATADIR%%/iccprofiles/input/Panasonic DMC-FZ150.icc
+%%DATADIR%%/iccprofiles/input/Panasonic DMC-FZ35.icc
+%%DATADIR%%/iccprofiles/input/Panasonic DMC-FZ38.icc
+%%DATADIR%%/iccprofiles/input/Panasonic DMC-G1.icc
+%%DATADIR%%/iccprofiles/input/Panasonic DMC-G3.icc
+%%DATADIR%%/iccprofiles/input/Panasonic DMC-GH1.icc
+%%DATADIR%%/iccprofiles/input/Panasonic DMC-GH2.icc
+%%DATADIR%%/iccprofiles/input/Pentax K200D.icc
+%%DATADIR%%/iccprofiles/input/Sony DSLR-A700.icc
+%%DATADIR%%/iccprofiles/output/RT_Large_g10.icc
+%%DATADIR%%/iccprofiles/output/RT_Large_gBT709.icc
+%%DATADIR%%/iccprofiles/output/RT_Large_gsRGB.icc
+%%DATADIR%%/iccprofiles/output/RT_Medium_gsRGB.icc
+%%DATADIR%%/iccprofiles/output/RT_sRGB.icm
+%%DATADIR%%/iccprofiles/output/RT_sRGB_g10.icm
+%%DATADIR%%/iccprofiles/output/RT_sRGB_gBT709.icm
+%%DATADIR%%/images/Chanmixer-BB.png
+%%DATADIR%%/images/Chanmixer-BG.png
+%%DATADIR%%/images/Chanmixer-BR.png
+%%DATADIR%%/images/Chanmixer-GB.png
+%%DATADIR%%/images/Chanmixer-GG.png
+%%DATADIR%%/images/Chanmixer-GR.png
+%%DATADIR%%/images/Chanmixer-RB.png
+%%DATADIR%%/images/Chanmixer-RG.png
+%%DATADIR%%/images/Chanmixer-RR.png
+%%DATADIR%%/images/Dark/.gtk-undo-ltr-small.png
+%%DATADIR%%/images/Dark/.gtk-undo-ltr.png
+%%DATADIR%%/images/Dark/.gtk-undo-rtl-small.png
+%%DATADIR%%/images/Dark/.gtk-undo-rtl.png
+%%DATADIR%%/images/Dark/actions/PanelEnding.png
+%%DATADIR%%/images/Dark/actions/beforeafter.png
+%%DATADIR%%/images/Dark/actions/cglabel0.png
+%%DATADIR%%/images/Dark/actions/cglabel1.png
+%%DATADIR%%/images/Dark/actions/cglabel2.png
+%%DATADIR%%/images/Dark/actions/cglabel3.png
+%%DATADIR%%/images/Dark/actions/cglabel4.png
+%%DATADIR%%/images/Dark/actions/cglabel5.png
+%%DATADIR%%/images/Dark/actions/clabel0.png
+%%DATADIR%%/images/Dark/actions/clabel1.png
+%%DATADIR%%/images/Dark/actions/clabel2.png
+%%DATADIR%%/images/Dark/actions/clabel3.png
+%%DATADIR%%/images/Dark/actions/clabel4.png
+%%DATADIR%%/images/Dark/actions/clabel5.png
+%%DATADIR%%/images/Dark/actions/closedhand.png
+%%DATADIR%%/images/Dark/actions/colour.png
+%%DATADIR%%/images/Dark/actions/crop-auto.png
+%%DATADIR%%/images/Dark/actions/crop.png
+%%DATADIR%%/images/Dark/actions/crossed-arrows-in.png
+%%DATADIR%%/images/Dark/actions/crossed-arrows-out.png
+%%DATADIR%%/images/Dark/actions/curveType-NURBS.png
+%%DATADIR%%/images/Dark/actions/curveType-controlPoints.png
+%%DATADIR%%/images/Dark/actions/curveType-flatLinear.png
+%%DATADIR%%/images/Dark/actions/curveType-linear.png
+%%DATADIR%%/images/Dark/actions/curveType-parametric.png
+%%DATADIR%%/images/Dark/actions/curveType-spline.png
+%%DATADIR%%/images/Dark/actions/detail.png
+%%DATADIR%%/images/Dark/actions/distorsion.png
+%%DATADIR%%/images/Dark/actions/distortion-auto.png
+%%DATADIR%%/images/Dark/actions/document-open-recent.png
+%%DATADIR%%/images/Dark/actions/document-open.png
+%%DATADIR%%/images/Dark/actions/edit-copy.png
+%%DATADIR%%/images/Dark/actions/edit-find.png
+%%DATADIR%%/images/Dark/actions/edit-paste.png
+%%DATADIR%%/images/Dark/actions/edited-small.png
+%%DATADIR%%/images/Dark/actions/edited.png
+%%DATADIR%%/images/Dark/actions/editedg-small.png
+%%DATADIR%%/images/Dark/actions/editednot-small.png
+%%DATADIR%%/images/Dark/actions/editednotg-small.png
+%%DATADIR%%/images/Dark/actions/exposure.png
+%%DATADIR%%/images/Dark/actions/filter.png
+%%DATADIR%%/images/Dark/actions/filterclear.png
+%%DATADIR%%/images/Dark/actions/fullscreen-exit.png
+%%DATADIR%%/images/Dark/actions/fullscreen.png
+%%DATADIR%%/images/Dark/actions/grayrated.png
+%%DATADIR%%/images/Dark/actions/gtk-add.png
+%%DATADIR%%/images/Dark/actions/gtk-apply.png
+%%DATADIR%%/images/Dark/actions/gtk-cancel.png
+%%DATADIR%%/images/Dark/actions/gtk-close-small.png
+%%DATADIR%%/images/Dark/actions/gtk-close.png
+%%DATADIR%%/images/Dark/actions/gtk-color-picker-small.png
+%%DATADIR%%/images/Dark/actions/gtk-color-picker.png
+%%DATADIR%%/images/Dark/actions/gtk-copy.png
+%%DATADIR%%/images/Dark/actions/gtk-edit.png
+%%DATADIR%%/images/Dark/actions/gtk-find.png
+%%DATADIR%%/images/Dark/actions/gtk-media-play.png
+%%DATADIR%%/images/Dark/actions/gtk-media-stop.png
+%%DATADIR%%/images/Dark/actions/gtk-ok.png
+%%DATADIR%%/images/Dark/actions/gtk-open.png
+%%DATADIR%%/images/Dark/actions/gtk-paste.png
+%%DATADIR%%/images/Dark/actions/gtk-preferences.png
+%%DATADIR%%/images/Dark/actions/gtk-remove.png
+%%DATADIR%%/images/Dark/actions/gtk-save-large.png
+%%DATADIR%%/images/Dark/actions/gtk-save.png
+%%DATADIR%%/images/Dark/actions/gtk-undo-ltr-small.png
+%%DATADIR%%/images/Dark/actions/gtk-undo-ltr.png
+%%DATADIR%%/images/Dark/actions/gtk-undo-rtl-small.png
+%%DATADIR%%/images/Dark/actions/gtk-undo-rtl.png
+%%DATADIR%%/images/Dark/actions/gtk-undoall-ltr.png
+%%DATADIR%%/images/Dark/actions/gtk-undoall-rtl.png
+%%DATADIR%%/images/Dark/actions/gtk-zoom-100.png
+%%DATADIR%%/images/Dark/actions/gtk-zoom-fit.png
+%%DATADIR%%/images/Dark/actions/gtk-zoom-in.png
+%%DATADIR%%/images/Dark/actions/gtk-zoom-out.png
+%%DATADIR%%/images/Dark/actions/histBar.png
+%%DATADIR%%/images/Dark/actions/histBarg.png
+%%DATADIR%%/images/Dark/actions/histBlue.png
+%%DATADIR%%/images/Dark/actions/histBlueg.png
+%%DATADIR%%/images/Dark/actions/histGreen.png
+%%DATADIR%%/images/Dark/actions/histGreeng.png
+%%DATADIR%%/images/Dark/actions/histRaw.png
+%%DATADIR%%/images/Dark/actions/histRawg.png
+%%DATADIR%%/images/Dark/actions/histRed.png
+%%DATADIR%%/images/Dark/actions/histRedg.png
+%%DATADIR%%/images/Dark/actions/histValue.png
+%%DATADIR%%/images/Dark/actions/histValueg.png
+%%DATADIR%%/images/Dark/actions/image-editor.png
+%%DATADIR%%/images/Dark/actions/info.png
+%%DATADIR%%/images/Dark/actions/list-add-small.png
+%%DATADIR%%/images/Dark/actions/list-add.png
+%%DATADIR%%/images/Dark/actions/list-remove-red-small.png
+%%DATADIR%%/images/Dark/actions/list-remove.png
+%%DATADIR%%/images/Dark/actions/lock-off.png
+%%DATADIR%%/images/Dark/actions/lock-on.png
+%%DATADIR%%/images/Dark/actions/media-usb.png
+%%DATADIR%%/images/Dark/actions/meta.png
+%%DATADIR%%/images/Dark/actions/new-detail-window.png
+%%DATADIR%%/images/Dark/actions/openhand.png
+%%DATADIR%%/images/Dark/actions/panel-to-bottom.png
+%%DATADIR%%/images/Dark/actions/panel-to-left.png
+%%DATADIR%%/images/Dark/actions/panel-to-right.png
+%%DATADIR%%/images/Dark/actions/panel-to-top.png
+%%DATADIR%%/images/Dark/actions/popuparrow.png
+%%DATADIR%%/images/Dark/actions/previewmodeB-off.png
+%%DATADIR%%/images/Dark/actions/previewmodeB-on.png
+%%DATADIR%%/images/Dark/actions/previewmodeF-off.png
+%%DATADIR%%/images/Dark/actions/previewmodeF-on.png
+%%DATADIR%%/images/Dark/actions/previewmodeG-off.png
+%%DATADIR%%/images/Dark/actions/previewmodeG-on.png
+%%DATADIR%%/images/Dark/actions/previewmodeL-off.png
+%%DATADIR%%/images/Dark/actions/previewmodeL-on.png
+%%DATADIR%%/images/Dark/actions/previewmodeR-off.png
+%%DATADIR%%/images/Dark/actions/previewmodeR-on.png
+%%DATADIR%%/images/Dark/actions/processing-pause.png
+%%DATADIR%%/images/Dark/actions/processing-play.png
+%%DATADIR%%/images/Dark/actions/processing-thumbnail.png
+%%DATADIR%%/images/Dark/actions/processing.png
+%%DATADIR%%/images/Dark/actions/rated.png
+%%DATADIR%%/images/Dark/actions/ratednot.png
+%%DATADIR%%/images/Dark/actions/ratednotg.png
+%%DATADIR%%/images/Dark/actions/raw.png
+%%DATADIR%%/images/Dark/actions/refresh-red.png
+%%DATADIR%%/images/Dark/actions/refresh-white.png
+%%DATADIR%%/images/Dark/actions/rtwindow.png
+%%DATADIR%%/images/Dark/actions/stock-flip-horizontal.png
+%%DATADIR%%/images/Dark/actions/stock-flip-vertical.png
+%%DATADIR%%/images/Dark/actions/stock-rotate-270.png
+%%DATADIR%%/images/Dark/actions/stock-rotate-90.png
+%%DATADIR%%/images/Dark/actions/straighten-small.png
+%%DATADIR%%/images/Dark/actions/straighten.png
+%%DATADIR%%/images/Dark/actions/toleftend.png
+%%DATADIR%%/images/Dark/actions/torightend.png
+%%DATADIR%%/images/Dark/actions/transform.png
+%%DATADIR%%/images/Dark/actions/trash-show-empty.png
+%%DATADIR%%/images/Dark/actions/trash-show-full.png
+%%DATADIR%%/images/Dark/actions/trash-thumbnail.png
+%%DATADIR%%/images/Dark/actions/trash.png
+%%DATADIR%%/images/Dark/actions/undelete-rtl.png
+%%DATADIR%%/images/Dark/actions/undelete-thumbnail-rtl.png
+%%DATADIR%%/images/Dark/actions/undelete-thumbnail.png
+%%DATADIR%%/images/Dark/actions/undelete.png
+%%DATADIR%%/images/Dark/actions/warnhl.png
+%%DATADIR%%/images/Dark/actions/warnsh.png
+%%DATADIR%%/images/Dark/actions/wb-auto.png
+%%DATADIR%%/images/Dark/actions/wb-camera.png
+%%DATADIR%%/images/Dark/actions/wb-cloudy.png
+%%DATADIR%%/images/Dark/actions/wb-custom.png
+%%DATADIR%%/images/Dark/actions/wb-flash.png
+%%DATADIR%%/images/Dark/actions/wb-fluorescent.png
+%%DATADIR%%/images/Dark/actions/wb-lamp.png
+%%DATADIR%%/images/Dark/actions/wb-led.png
+%%DATADIR%%/images/Dark/actions/wb-shade.png
+%%DATADIR%%/images/Dark/actions/wb-sun.png
+%%DATADIR%%/images/Dark/actions/wb-tungsten.png
+%%DATADIR%%/images/Dark/devices/computer.png
+%%DATADIR%%/images/Dark/devices/drive-harddisk.png
+%%DATADIR%%/images/Dark/devices/drive-optical.png
+%%DATADIR%%/images/Dark/devices/drive-removable-media.png
+%%DATADIR%%/images/Dark/devices/gtk-cdrom.png
+%%DATADIR%%/images/Dark/devices/media-flash.png
+%%DATADIR%%/images/Dark/devices/media-floppy.png
+%%DATADIR%%/images/Dark/devices/media-optical-bd.png
+%%DATADIR%%/images/Dark/devices/media-optical-dvd.png
+%%DATADIR%%/images/Dark/devices/media-optical.png
+%%DATADIR%%/images/Dark/devices/media-tape.png
+%%DATADIR%%/images/Dark/index.theme
+%%DATADIR%%/images/Dark/places/folder.png
+%%DATADIR%%/images/Dark/places/gtk-directory.png
+%%DATADIR%%/images/Dark/places/user-desktop.png
+%%DATADIR%%/images/Dark/places/user-home.png
+%%DATADIR%%/images/Light/.gtk-undo-ltr-small.png
+%%DATADIR%%/images/Light/.gtk-undo-ltr.png
+%%DATADIR%%/images/Light/.gtk-undo-rtl-small.png
+%%DATADIR%%/images/Light/.gtk-undo-rtl.png
+%%DATADIR%%/images/Light/actions/PanelEnding.png
+%%DATADIR%%/images/Light/actions/beforeafter.png
+%%DATADIR%%/images/Light/actions/cglabel0.png
+%%DATADIR%%/images/Light/actions/cglabel1.png
+%%DATADIR%%/images/Light/actions/cglabel2.png
+%%DATADIR%%/images/Light/actions/cglabel3.png
+%%DATADIR%%/images/Light/actions/cglabel4.png
+%%DATADIR%%/images/Light/actions/cglabel5.png
+%%DATADIR%%/images/Light/actions/clabel0.png
+%%DATADIR%%/images/Light/actions/clabel1.png
+%%DATADIR%%/images/Light/actions/clabel2.png
+%%DATADIR%%/images/Light/actions/clabel3.png
+%%DATADIR%%/images/Light/actions/clabel4.png
+%%DATADIR%%/images/Light/actions/clabel5.png
+%%DATADIR%%/images/Light/actions/closedhand.png
+%%DATADIR%%/images/Light/actions/colour.png
+%%DATADIR%%/images/Light/actions/crop-auto.png
+%%DATADIR%%/images/Light/actions/crop.png
+%%DATADIR%%/images/Light/actions/crossed-arrows-in.png
+%%DATADIR%%/images/Light/actions/crossed-arrows-out.png
+%%DATADIR%%/images/Light/actions/curveType-NURBS.png
+%%DATADIR%%/images/Light/actions/curveType-controlPoints.png
+%%DATADIR%%/images/Light/actions/curveType-flatLinear.png
+%%DATADIR%%/images/Light/actions/curveType-linear.png
+%%DATADIR%%/images/Light/actions/curveType-parametric.png
+%%DATADIR%%/images/Light/actions/curveType-spline.png
+%%DATADIR%%/images/Light/actions/detail.png
+%%DATADIR%%/images/Light/actions/distorsion.png
+%%DATADIR%%/images/Light/actions/distortion-auto.png
+%%DATADIR%%/images/Light/actions/document-open-recent.png
+%%DATADIR%%/images/Light/actions/document-open.png
+%%DATADIR%%/images/Light/actions/edit-copy.png
+%%DATADIR%%/images/Light/actions/edit-find.png
+%%DATADIR%%/images/Light/actions/edit-paste.png
+%%DATADIR%%/images/Light/actions/edited-small.png
+%%DATADIR%%/images/Light/actions/edited.png
+%%DATADIR%%/images/Light/actions/editedg-small.png
+%%DATADIR%%/images/Light/actions/editednot-small.png
+%%DATADIR%%/images/Light/actions/editednotg-small.png
+%%DATADIR%%/images/Light/actions/exposure.png
+%%DATADIR%%/images/Light/actions/filter.png
+%%DATADIR%%/images/Light/actions/filterclear.png
+%%DATADIR%%/images/Light/actions/fullscreen-exit.png
+%%DATADIR%%/images/Light/actions/fullscreen.png
+%%DATADIR%%/images/Light/actions/grayrated.png
+%%DATADIR%%/images/Light/actions/gtk-add.png
+%%DATADIR%%/images/Light/actions/gtk-apply.png
+%%DATADIR%%/images/Light/actions/gtk-cancel.png
+%%DATADIR%%/images/Light/actions/gtk-close-small.png
+%%DATADIR%%/images/Light/actions/gtk-close.png
+%%DATADIR%%/images/Light/actions/gtk-color-picker-small.png
+%%DATADIR%%/images/Light/actions/gtk-color-picker.png
+%%DATADIR%%/images/Light/actions/gtk-copy.png
+%%DATADIR%%/images/Light/actions/gtk-edit.png
+%%DATADIR%%/images/Light/actions/gtk-find.png
+%%DATADIR%%/images/Light/actions/gtk-media-play.png
+%%DATADIR%%/images/Light/actions/gtk-media-stop.png
+%%DATADIR%%/images/Light/actions/gtk-ok.png
+%%DATADIR%%/images/Light/actions/gtk-open.png
+%%DATADIR%%/images/Light/actions/gtk-paste.png
+%%DATADIR%%/images/Light/actions/gtk-preferences.png
+%%DATADIR%%/images/Light/actions/gtk-remove.png
+%%DATADIR%%/images/Light/actions/gtk-save-large.png
+%%DATADIR%%/images/Light/actions/gtk-save.png
+%%DATADIR%%/images/Light/actions/gtk-undo-ltr-small.png
+%%DATADIR%%/images/Light/actions/gtk-undo-ltr.png
+%%DATADIR%%/images/Light/actions/gtk-undo-rtl-small.png
+%%DATADIR%%/images/Light/actions/gtk-undo-rtl.png
+%%DATADIR%%/images/Light/actions/gtk-undoall-ltr.png
+%%DATADIR%%/images/Light/actions/gtk-undoall-rtl.png
+%%DATADIR%%/images/Light/actions/gtk-zoom-100.png
+%%DATADIR%%/images/Light/actions/gtk-zoom-fit.png
+%%DATADIR%%/images/Light/actions/gtk-zoom-in.png
+%%DATADIR%%/images/Light/actions/gtk-zoom-out.png
+%%DATADIR%%/images/Light/actions/histBar.png
+%%DATADIR%%/images/Light/actions/histBarg.png
+%%DATADIR%%/images/Light/actions/histBlue.png
+%%DATADIR%%/images/Light/actions/histBlueg.png
+%%DATADIR%%/images/Light/actions/histGreen.png
+%%DATADIR%%/images/Light/actions/histGreeng.png
+%%DATADIR%%/images/Light/actions/histRaw.png
+%%DATADIR%%/images/Light/actions/histRawg.png
+%%DATADIR%%/images/Light/actions/histRed.png
+%%DATADIR%%/images/Light/actions/histRedg.png
+%%DATADIR%%/images/Light/actions/histValue.png
+%%DATADIR%%/images/Light/actions/histValueg.png
+%%DATADIR%%/images/Light/actions/image-editor.png
+%%DATADIR%%/images/Light/actions/info.png
+%%DATADIR%%/images/Light/actions/list-add-small.png
+%%DATADIR%%/images/Light/actions/list-add.png
+%%DATADIR%%/images/Light/actions/list-remove-red-small.png
+%%DATADIR%%/images/Light/actions/list-remove.png
+%%DATADIR%%/images/Light/actions/lock-off.png
+%%DATADIR%%/images/Light/actions/lock-on.png
+%%DATADIR%%/images/Light/actions/media-usb.png
+%%DATADIR%%/images/Light/actions/meta.png
+%%DATADIR%%/images/Light/actions/new-detail-window.png
+%%DATADIR%%/images/Light/actions/openhand.png
+%%DATADIR%%/images/Light/actions/panel-to-bottom.png
+%%DATADIR%%/images/Light/actions/panel-to-left.png
+%%DATADIR%%/images/Light/actions/panel-to-right.png
+%%DATADIR%%/images/Light/actions/panel-to-top.png
+%%DATADIR%%/images/Light/actions/popuparrow.png
+%%DATADIR%%/images/Light/actions/previewmodeB-off.png
+%%DATADIR%%/images/Light/actions/previewmodeB-on.png
+%%DATADIR%%/images/Light/actions/previewmodeF-off.png
+%%DATADIR%%/images/Light/actions/previewmodeF-on.png
+%%DATADIR%%/images/Light/actions/previewmodeG-off.png
+%%DATADIR%%/images/Light/actions/previewmodeG-on.png
+%%DATADIR%%/images/Light/actions/previewmodeL-off.png
+%%DATADIR%%/images/Light/actions/previewmodeL-on.png
+%%DATADIR%%/images/Light/actions/previewmodeR-off.png
+%%DATADIR%%/images/Light/actions/previewmodeR-on.png
+%%DATADIR%%/images/Light/actions/processing-pause.png
+%%DATADIR%%/images/Light/actions/processing-play.png
+%%DATADIR%%/images/Light/actions/processing-thumbnail.png
+%%DATADIR%%/images/Light/actions/processing.png
+%%DATADIR%%/images/Light/actions/rated.png
+%%DATADIR%%/images/Light/actions/ratednot.png
+%%DATADIR%%/images/Light/actions/ratednotg.png
+%%DATADIR%%/images/Light/actions/raw.png
+%%DATADIR%%/images/Light/actions/refresh-red.png
+%%DATADIR%%/images/Light/actions/refresh-white.png
+%%DATADIR%%/images/Light/actions/rtwindow.png
+%%DATADIR%%/images/Light/actions/stock-flip-horizontal.png
+%%DATADIR%%/images/Light/actions/stock-flip-vertical.png
+%%DATADIR%%/images/Light/actions/stock-rotate-270.png
+%%DATADIR%%/images/Light/actions/stock-rotate-90.png
+%%DATADIR%%/images/Light/actions/straighten-small.png
+%%DATADIR%%/images/Light/actions/straighten.png
+%%DATADIR%%/images/Light/actions/toleftend.png
+%%DATADIR%%/images/Light/actions/torightend.png
+%%DATADIR%%/images/Light/actions/transform.png
+%%DATADIR%%/images/Light/actions/trash-show-empty.png
+%%DATADIR%%/images/Light/actions/trash-show-full.png
+%%DATADIR%%/images/Light/actions/trash-thumbnail.png
+%%DATADIR%%/images/Light/actions/trash.png
+%%DATADIR%%/images/Light/actions/undelete-rtl.png
+%%DATADIR%%/images/Light/actions/undelete-thumbnail-rtl.png
+%%DATADIR%%/images/Light/actions/undelete-thumbnail.png
+%%DATADIR%%/images/Light/actions/undelete.png
+%%DATADIR%%/images/Light/actions/warnhl.png
+%%DATADIR%%/images/Light/actions/warnsh.png
+%%DATADIR%%/images/Light/actions/wb-auto.png
+%%DATADIR%%/images/Light/actions/wb-camera.png
+%%DATADIR%%/images/Light/actions/wb-cloudy.png
+%%DATADIR%%/images/Light/actions/wb-custom.png
+%%DATADIR%%/images/Light/actions/wb-flash.png
+%%DATADIR%%/images/Light/actions/wb-fluorescent.png
+%%DATADIR%%/images/Light/actions/wb-lamp.png
+%%DATADIR%%/images/Light/actions/wb-led.png
+%%DATADIR%%/images/Light/actions/wb-shade.png
+%%DATADIR%%/images/Light/actions/wb-sun.png
+%%DATADIR%%/images/Light/actions/wb-tungsten.png
+%%DATADIR%%/images/Light/devices/computer.png
+%%DATADIR%%/images/Light/devices/drive-harddisk.png
+%%DATADIR%%/images/Light/devices/drive-optical.png
+%%DATADIR%%/images/Light/devices/drive-removable-media.png
+%%DATADIR%%/images/Light/devices/gtk-cdrom.png
+%%DATADIR%%/images/Light/devices/media-flash.png
+%%DATADIR%%/images/Light/devices/media-floppy.png
+%%DATADIR%%/images/Light/devices/media-optical-bd.png
+%%DATADIR%%/images/Light/devices/media-optical-dvd.png
+%%DATADIR%%/images/Light/devices/media-optical.png
+%%DATADIR%%/images/Light/devices/media-tape.png
+%%DATADIR%%/images/Light/index.theme
+%%DATADIR%%/images/Light/places/folder.png
+%%DATADIR%%/images/Light/places/gtk-directory.png
+%%DATADIR%%/images/Light/places/user-desktop.png
+%%DATADIR%%/images/Light/places/user-home.png
+%%DATADIR%%/images/PanelEnding.png
 %%DATADIR%%/images/beforeafter.png
-%%DATADIR%%/images/cdrom.png
 %%DATADIR%%/images/cglabel0.png
 %%DATADIR%%/images/cglabel1.png
 %%DATADIR%%/images/cglabel2.png
@@ -27,12 +411,12 @@ share/icons/hicolor/256x256/apps/rawtherapee.png
 %%DATADIR%%/images/clabel3.png
 %%DATADIR%%/images/clabel4.png
 %%DATADIR%%/images/clabel5.png
-%%DATADIR%%/images/closedhand22.png
-%%DATADIR%%/images/crop16.png
-%%DATADIR%%/images/crop22.png
-%%DATADIR%%/images/crop_auto_22.png
-%%DATADIR%%/images/cross22.png
-%%DATADIR%%/images/crossed_arrows_out_45_02.png
+%%DATADIR%%/images/closedhand.png
+%%DATADIR%%/images/colour.png
+%%DATADIR%%/images/crop-auto.png
+%%DATADIR%%/images/crop.png
+%%DATADIR%%/images/cross.png
+%%DATADIR%%/images/crossed-arrows-out.png
 %%DATADIR%%/images/curveType-NURBS.png
 %%DATADIR%%/images/curveType-controlPoints.png
 %%DATADIR%%/images/curveType-flatLinear.png
@@ -40,128 +424,100 @@ share/icons/hicolor/256x256/apps/rawtherapee.png
 %%DATADIR%%/images/curveType-parametric.png
 %%DATADIR%%/images/curveType-spline.png
 %%DATADIR%%/images/curveType-unchanged.png
-%%DATADIR%%/images/deltagl.png
-%%DATADIR%%/images/deltags.png
+%%DATADIR%%/images/default-settings-ltr.png
+%%DATADIR%%/images/default-settings-rtl.png
+%%DATADIR%%/images/detail.png
+%%DATADIR%%/images/distortion-auto.png
 %%DATADIR%%/images/distortion.png
-%%DATADIR%%/images/distortion_auto.png
-%%DATADIR%%/images/down.png
+%%DATADIR%%/images/edited-small.png
 %%DATADIR%%/images/edited.png
-%%DATADIR%%/images/edited_10.png
-%%DATADIR%%/images/editedg_10.png
-%%DATADIR%%/images/editednot_10.png
-%%DATADIR%%/images/editednotg_10.png
+%%DATADIR%%/images/editedg-small.png
+%%DATADIR%%/images/editednot-small.png
+%%DATADIR%%/images/editednotg-small.png
 %%DATADIR%%/images/empty.png
-%%DATADIR%%/images/fileopen.png
-%%DATADIR%%/images/filesave.png
+%%DATADIR%%/images/exposure.png
 %%DATADIR%%/images/filter.png
 %%DATADIR%%/images/filterclear.png
-%%DATADIR%%/images/filterclear_18.png
-%%DATADIR%%/images/filterclearg_18.png
-%%DATADIR%%/images/flame22.png
-%%DATADIR%%/images/floppy.png
 %%DATADIR%%/images/folder.png
-%%DATADIR%%/images/folder_bw.png
-%%DATADIR%%/images/folder_open.png
-%%DATADIR%%/images/folder_open_r.png
-%%DATADIR%%/images/folder_orange.png
-%%DATADIR%%/images/folder_orange_open.png
-%%DATADIR%%/images/folder_r.png
+%%DATADIR%%/images/fullscreen-exit.png
 %%DATADIR%%/images/fullscreen.png
-%%DATADIR%%/images/gimp.png
 %%DATADIR%%/images/grayrated.png
-%%DATADIR%%/images/green.png
+%%DATADIR%%/images/gtk-add.png
+%%DATADIR%%/images/gtk-apply.png
+%%DATADIR%%/images/gtk-close-small.png
 %%DATADIR%%/images/gtk-close.png
-%%DATADIR%%/images/gtk-undo-ltr-big.png
+%%DATADIR%%/images/gtk-color-picker-small.png
+%%DATADIR%%/images/gtk-color-picker.png
+%%DATADIR%%/images/gtk-open.png
+%%DATADIR%%/images/gtk-save-large.png
 %%DATADIR%%/images/gtk-undo-ltr.png
+%%DATADIR%%/images/gtk-undo-rtl.png
+%%DATADIR%%/images/gtk-undoall-ltr.png
+%%DATADIR%%/images/gtk-undoall-rtl.png
 %%DATADIR%%/images/gtk-zoom-100.png
 %%DATADIR%%/images/gtk-zoom-fit.png
 %%DATADIR%%/images/gtk-zoom-in.png
 %%DATADIR%%/images/gtk-zoom-out.png
-%%DATADIR%%/images/hdd.png
-%%DATADIR%%/images/head.png
 %%DATADIR%%/images/histBar.png
 %%DATADIR%%/images/histBlue.png
 %%DATADIR%%/images/histGreen.png
 %%DATADIR%%/images/histRaw.png
 %%DATADIR%%/images/histRed.png
 %%DATADIR%%/images/histValue.png
-%%DATADIR%%/images/horizontal.png
-%%DATADIR%%/images/horizontals.png
-%%DATADIR%%/images/icon-gears.png
+%%DATADIR%%/images/image-editor.png
 %%DATADIR%%/images/info.png
-%%DATADIR%%/images/left.png
-%%DATADIR%%/images/list-add.png
-%%DATADIR%%/images/list-add12.png
+%%DATADIR%%/images/list-add-small.png
+%%DATADIR%%/images/list-remove-red-small.png
 %%DATADIR%%/images/list-remove.png
-%%DATADIR%%/images/list-remove12r.png
-%%DATADIR%%/images/logoicon16.png
-%%DATADIR%%/images/logoicon16b.png
-%%DATADIR%%/images/logoicon32.png
-%%DATADIR%%/images/logoicon_wind_16.png
+%%DATADIR%%/images/lock-off.png
+%%DATADIR%%/images/lock-on.png
+%%DATADIR%%/images/logoicon-wind.png
+%%DATADIR%%/images/media-usb.png
+%%DATADIR%%/images/meta.png
 %%DATADIR%%/images/network.png
 %%DATADIR%%/images/nocolorlabel.png
 %%DATADIR%%/images/notrated.png
 %%DATADIR%%/images/openhand.png
-%%DATADIR%%/images/openhand22.png
-%%DATADIR%%/images/openhand_gray22.png
-%%DATADIR%%/images/panel_to_bottom.png
-%%DATADIR%%/images/panel_to_left.png
-%%DATADIR%%/images/panel_to_right.png
-%%DATADIR%%/images/panel_to_top.png
+%%DATADIR%%/images/panel-to-bottom.png
+%%DATADIR%%/images/panel-to-left.png
+%%DATADIR%%/images/panel-to-right.png
+%%DATADIR%%/images/panel-to-top.png
+%%DATADIR%%/images/popuparrow.png
 %%DATADIR%%/images/processing-pause.png
 %%DATADIR%%/images/processing-play.png
 %%DATADIR%%/images/processing.png
 %%DATADIR%%/images/rated.png
-%%DATADIR%%/images/ratednot_10.png
-%%DATADIR%%/images/ratednotg_10.png
-%%DATADIR%%/images/red.png
-%%DATADIR%%/images/refresh_red.png
-%%DATADIR%%/images/refresh_white.png
+%%DATADIR%%/images/ratednot.png
+%%DATADIR%%/images/ratednotg.png
+%%DATADIR%%/images/raw.png
+%%DATADIR%%/images/recent-save.png
+%%DATADIR%%/images/refresh-red.png
+%%DATADIR%%/images/refresh-white.png
 %%DATADIR%%/images/resize.png
-%%DATADIR%%/images/right.png
-%%DATADIR%%/images/right_red.png
-%%DATADIR%%/images/save_hdd_01.png
+%%DATADIR%%/images/rt-logo-large.png
+%%DATADIR%%/images/rt-logo.png
 %%DATADIR%%/images/saved.png
-%%DATADIR%%/images/saved_10.png
-%%DATADIR%%/images/savedg_10.png
-%%DATADIR%%/images/savednot_10.png
-%%DATADIR%%/images/savednotg_10.png
+%%DATADIR%%/images/savedg.png
+%%DATADIR%%/images/savednot.png
+%%DATADIR%%/images/savednotg.png
 %%DATADIR%%/images/splash.png
-%%DATADIR%%/images/stock-color-picker-gray-18.png
-%%DATADIR%%/images/stock-flip-horizontal-16.png
-%%DATADIR%%/images/stock-flip-vertical-16.png
-%%DATADIR%%/images/stock-resize-16.png
-%%DATADIR%%/images/stock-rotate-270-16.png
-%%DATADIR%%/images/stock-rotate-90-16.png
-%%DATADIR%%/images/stock-tool-color-picker-22.png
-%%DATADIR%%/images/stock-tool-crop-16.png
-%%DATADIR%%/images/stock-tool-crop-22.png
-%%DATADIR%%/images/stock_clear_24.png
-%%DATADIR%%/images/stock_down_arrow_24.png
-%%DATADIR%%/images/stock_left_arrow_24.png
-%%DATADIR%%/images/stock_right_arrow_24.png
-%%DATADIR%%/images/stock_up_arrow_24.png
-%%DATADIR%%/images/straighten16.png
-%%DATADIR%%/images/straighten22.png
-%%DATADIR%%/images/tail.png
+%%DATADIR%%/images/stock-flip-horizontal.png
+%%DATADIR%%/images/stock-flip-vertical.png
+%%DATADIR%%/images/stock-rotate-270.png
+%%DATADIR%%/images/stock-rotate-90.png
+%%DATADIR%%/images/straighten-small.png
+%%DATADIR%%/images/straighten.png
 %%DATADIR%%/images/toleftend.png
 %%DATADIR%%/images/torightend.png
+%%DATADIR%%/images/transform.png
 %%DATADIR%%/images/trash-show-empty.png
 %%DATADIR%%/images/trash-show-full.png
 %%DATADIR%%/images/trash.png
 %%DATADIR%%/images/uncolorlabel.png
 %%DATADIR%%/images/undelete.png
-%%DATADIR%%/images/undo.png
 %%DATADIR%%/images/unrated.png
-%%DATADIR%%/images/usbpendrive.png
-%%DATADIR%%/images/vertical.png
-%%DATADIR%%/images/verticals.png
 %%DATADIR%%/images/warnhl.png
 %%DATADIR%%/images/warnsh.png
-%%DATADIR%%/images/wb22.png
-%%DATADIR%%/images/wbpicker16.png
-%%DATADIR%%/images/wbpicker22.png
-%%DATADIR%%/images/x_10.png
 %%DATADIR%%/languages/Catala
 %%DATADIR%%/languages/Chinese (Simplified)
 %%DATADIR%%/languages/Chinese (Traditional)
@@ -195,16 +551,16 @@ share/icons/hicolor/256x256/apps/rawtherapee.png
 %%DATADIR%%/languages/Swedish
 %%DATADIR%%/languages/Turkish
 %%DATADIR%%/languages/default
+%%DATADIR%%/options
 %%DATADIR%%/profiles/BW-1.pp3
 %%DATADIR%%/profiles/BW-2.pp3
+%%DATADIR%%/profiles/BW-3.pp3
+%%DATADIR%%/profiles/BW-4.pp3
+%%DATADIR%%/profiles/Highkey-1.pp3
 %%DATADIR%%/profiles/Natural-1.pp3
 %%DATADIR%%/profiles/Natural-2.pp3
-%%DATADIR%%/profiles/Punchy-0.pp3
 %%DATADIR%%/profiles/Punchy-1.pp3
 %%DATADIR%%/profiles/Punchy-2.pp3
-%%DATADIR%%/profiles/Tuned-1.pp3
-%%DATADIR%%/profiles/Tuned-2.pp3
-%%DATADIR%%/profiles/Tuned-3.pp3
 %%DATADIR%%/profiles/default-ISO-high.pp3
 %%DATADIR%%/profiles/default-ISO-medium.pp3
 %%DATADIR%%/profiles/default.pp3
@@ -212,13 +568,34 @@ share/icons/hicolor/256x256/apps/rawtherapee.png
 %%DATADIR%%/sounds/BatchComplete.wav
 %%DATADIR%%/sounds/Empty.wav
 %%DATADIR%%/sounds/ProcessComplete.wav
+%%DATADIR%%/themes/09-Gray-Orange.gtkrc
+%%DATADIR%%/themes/09-Gray-Orange.iconset
+%%DATADIR%%/themes/17-Gray-Red.gtkrc
+%%DATADIR%%/themes/17-Gray-Red.iconset
+%%DATADIR%%/themes/21-Gray-Gray.gtkrc
+%%DATADIR%%/themes/21-Gray-Gray.iconset
+%%DATADIR%%/themes/25-Gray-Gray.gtkrc
+%%DATADIR%%/themes/25-Gray-Gray.iconset
+%%DATADIR%%/themes/25-Gray-Purple.gtkrc
+%%DATADIR%%/themes/25-Gray-Purple.iconset
+%%DATADIR%%/themes/25-Gray-Red.gtkrc
+%%DATADIR%%/themes/25-Gray-Red.iconset
+%%DATADIR%%/themes/37-Gray-Red-Textured.gtkrc
+%%DATADIR%%/themes/37-Gray-Red-Textured.iconset
+%%DATADIR%%/themes/37-Gray-Red.gtkrc
+%%DATADIR%%/themes/37-Gray-Red.iconset
+%%DATADIR%%/themes/63-Gray-Cyan.gtkrc
+%%DATADIR%%/themes/63-Gray-Cyan.iconset
+%%DATADIR%%/themes/92-Beige-DarkCyan.gtkrc
+%%DATADIR%%/themes/Default.gtkrc
+%%DATADIR%%/themes/Default.iconset
+%%DATADIR%%/themes/gray_textured/arrow-down-ins.png
 %%DATADIR%%/themes/gray_textured/arrow-down-pre.png
 %%DATADIR%%/themes/gray_textured/arrow-down.png
 %%DATADIR%%/themes/gray_textured/arrow-left-ins.png
 %%DATADIR%%/themes/gray_textured/arrow-left-pre.png
 %%DATADIR%%/themes/gray_textured/arrow-left.png
 %%DATADIR%%/themes/gray_textured/arrow-right-ins.png
-%%DATADIR%%/themes/gray_textured/trough2.png
 %%DATADIR%%/themes/gray_textured/arrow-right-pre.png
 %%DATADIR%%/themes/gray_textured/arrow-right.png
 %%DATADIR%%/themes/gray_textured/arrow-up-ins.png
@@ -242,26 +619,26 @@ share/icons/hicolor/256x256/apps/rawtherapee.png
 %%DATADIR%%/themes/gray_textured/slider-v-pre.png
 %%DATADIR%%/themes/gray_textured/slider-v.png
 %%DATADIR%%/themes/gray_textured/trough2-h.png
-%%DATADIR%%/themes/gray_textured/arrow-down-ins.png
-%%DATADIR%%/themes/17-Gray-Red.gtkrc
-%%DATADIR%%/themes/21-Gray-Gray.gtkrc
-%%DATADIR%%/themes/25-Gray-Gray.gtkrc
-%%DATADIR%%/themes/25-Gray-Purple.gtkrc
-%%DATADIR%%/themes/25-Gray-Red.gtkrc
-%%DATADIR%%/themes/37-Gray-Red-Textured.gtkrc
-%%DATADIR%%/themes/37-Gray-Red.gtkrc
-%%DATADIR%%/themes/63-Gray-Cyan.gtkrc
-%%DATADIR%%/themes/92-Beige-DarkCyan.gtkrc
-%%DATADIR%%/themes/Default.gtkrc
-%%DATADIR%%/themes/09-Gray-Orange.gtkrc
+%%DATADIR%%/themes/gray_textured/trough2.png
 %%DATADIR%%/themes/slim
-%%DATADIR%%/options
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/languages
-@dirrm %%DATADIR%%/profiles
-@dirrm %%DATADIR%%/sounds
+%%DATADIR%%/themes/system.iconset
 @dirrm %%DATADIR%%/themes/gray_textured
 @dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%/profiles
+@dirrm %%DATADIR%%/languages
+@dirrm %%DATADIR%%/images/Light/places
+@dirrm %%DATADIR%%/images/Light/devices
+@dirrm %%DATADIR%%/images/Light/actions
+@dirrm %%DATADIR%%/images/Light
+@dirrm %%DATADIR%%/images/Dark/places
+@dirrm %%DATADIR%%/images/Dark/devices
+@dirrm %%DATADIR%%/images/Dark/actions
+@dirrm %%DATADIR%%/images/Dark
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%/iccprofiles/output
+@dirrm %%DATADIR%%/iccprofiles/input
+@dirrm %%DATADIR%%/iccprofiles
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%
 @dirrmtry share/applications